xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject svn commit: r676264 [7/11] - in /xalan/c/trunk: Projects/Win32/Res/Localization/ Projects/Win32/VC6/AllInOne/ Projects/Win32/VC7.1/AllInOne/ Projects/Win32/VC7/AllInOne/ Projects/Win32/VC8/AllInOne/ Projects/Win32/VC8/CompileStylesheet/ Projects/Win32/...
Date Sun, 13 Jul 2008 06:16:50 GMT
Modified: xalan/c/trunk/src/xalanc/XalanDOM/XalanText.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanDOM/XalanText.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanDOM/XalanText.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanDOM/XalanText.hpp Sat Jul 12 23:16:42 2008
@@ -141,179 +141,6 @@
 	virtual XalanDocument*
 	getOwnerDocument() const = 0;
 
-	//@}
-	/** @name Cloning function. */
-	//@{
-
-	/**
-	 * Returns a duplicate of this node.
-	 *
-	 * This function serves as a generic copy constructor for nodes.
-	 *
-	 * The duplicate node has no parent (
-	 * <code>parentNode</code> returns <code>null</code>.).
-	 * <br>Cloning an <code>Element</code> copies all attributes and their
-	 * values, including those generated by the  XML processor to represent
-	 * defaulted attributes, but this method does not copy any text it contains
-	 * unless it is a deep clone, since the text is contained in a child
-	 * <code>Text</code> node. Cloning any other type of node simply returns a
-	 * copy of this node.
-	 * @param deep If <code>true</code>, recursively clone the subtree under the
-	 *	 specified node; if <code>false</code>, clone only the node itself (and
-	 *	 its attributes, if it is an <code>Element</code>).
-	 * @return The duplicate node.
-	 */
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanText*
-#endif
-	cloneNode(bool deep) const = 0;
-
-	//@}
-	/** @name Functions to modify the DOM Node. */
-	//@{
-
-	/**
-	 * Inserts the node <code>newChild</code> before the existing child node
-	 * <code>refChild</code>.
-	 *
-	 * If <code>refChild</code> is <code>null</code>,
-	 * insert <code>newChild</code> at the end of the list of children.
-	 * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
-	 * all of its children are inserted, in the same order, before
-	 * <code>refChild</code>. If the <code>newChild</code> is already in the
-	 * tree, it is first removed.  Note that a <code>Node</code> that
-	 * has never been assigned to refer to an actual node is == null.
-	 * @param newChild The node to insert.
-	 * @param refChild The reference node, i.e., the node before which the new
-	 *	 node must be inserted.
-	 * @return The node being inserted.
-	 */
-	virtual XalanNode*
-	insertBefore(
-			XalanNode*	newChild,
-			XalanNode*	refChild) = 0;
-
-	/**
-	 * Replaces the child node <code>oldChild</code> with <code>newChild</code>
-	 * in the list of children, and returns the <code>oldChild</code> node.
-	 *
-	 * If <CODE>newChild</CODE> is a <CODE>DocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DocumentFragment</CODE>
-	 * children, which are inserted in the same order.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is first removed.
-	 * @param newChild The new node to put in the child list.
-	 * @param oldChild The node being replaced in the list.
-	 * @return The node replaced.
-	 */
-	virtual XalanNode*
-	replaceChild(
-			XalanNode*	newChild,
-			XalanNode*	oldChild) = 0;
-
-	/**
-	 * Removes the child node indicated by <code>oldChild</code> from the list
-	 * of children, and returns it.
-	 *
-	 * @param oldChild The node being removed.
-	 * @return The node removed.
-	 */
-	virtual XalanNode*
-	removeChild(XalanNode*	oldChild) = 0;
-
-	/**
-	 * Adds the node <code>newChild</code> to the end of the list of children of
-	 * this node.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is
-	 * first removed.
-	 * @param newChild The node to add.If it is a  <code>DocumentFragment</code>
-	 *	 object, the entire contents of the document fragment are moved into
-	 *	 the child list of this node
-	 * @return The node added.
-	 */
-	virtual XalanNode*
-	appendChild(XalanNode*	newChild) = 0;
-
-	//@}
-	/** @name Query functions. */
-	//@{
-
-	/**
-	 *	This is a convenience method to allow easy determination of whether a
-	 * node has any children.
-	 *
-	 * @return	<code>true</code> if the node has any children,
-	 *	 <code>false</code> if the node has no children.
-	 */
-	virtual bool
-	hasChildNodes() const = 0;
-
-
-	//@}
-	/** @name Set functions. */
-	//@{
-
-
-	/**
-	* Sets the value of the node.
-	*
-	* Any node which can have a nodeValue (@see getNodeValue) will
-	* also accept requests to set it to a string. The exact response to
-	* this varies from node to node -- Attribute, for example, stores
-	* its values in its children and has to replace them with a new Text
-	* holding the replacement value.
-	*
-	* For most types of Node, value is null and attempting to set it
-	* will throw DOMException(NO_MODIFICATION_ALLOWED_ERR). This will
-	* also be thrown if the node is read-only.
-	*/
-	virtual void
-	setNodeValue(const XalanDOMString& 	nodeValue) = 0;
-
-	//@}
-	/** @name Functions introduced in DOM Level 2. */
-	//@{
-
-	/**
-	 * Puts all <CODE>Text</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>Node</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>Text</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>Text</CODE>
-	 * nodes. This can be used to ensure that the DOM view of a document is the 
-	 * same as if it were saved and re-loaded, and is useful when operations 
-	 * (such as XPointer lookups) that depend on a particular document tree 
-	 * structure are to be used.
-	 * <P><B>Note:</B> In cases where the document contains <CODE>CDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>Text</CODE>
-	 * nodes and <CODE>CDATASection</CODE> nodes.</P>
-	 */
-	virtual void
-	normalize() = 0;
-
-	/**
-	 * Tests whether the DOM implementation implements a specific
-	 * feature and that feature is supported by this node.
-	 * @param feature The string of the feature to test. This is the same
-	 * name as what can be passed to the method <code>hasFeature</code> on
-	 * <code>DOMImplementation</code>.
-	 * @param version This is the version number of the feature to test. In
-	 * Level 2, version 1, this is the string "2.0". If the version is not
-	 * specified, supporting any version of the feature will cause the
-	 * method to return <code>true</code>.
-	 * @return Returns <code>true</code> if the specified feature is supported
-	 * on this node, <code>false</code> otherwise.
-	 */
-	virtual bool
-	isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const = 0;
-
 	/**
 	 * Get the <em>namespace URI</em> of
 	 * this node, or <code>null</code> if it is unspecified.
@@ -348,38 +175,6 @@
 	getLocalName() const = 0;
 
 	/**
-	 * Set the <em>namespace prefix</em> of this node.
-	 * <p>
-	 * Note that setting this attribute, when permitted, changes 
-	 * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified 
-	 * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE> 
-	 * attributes of the <CODE>Element</CODE> and <CODE>Attr</CODE>
-	 * interfaces, when applicable.
-	 * <p>
-	 * Note also that changing the prefix of an 
-	 * attribute, that is known to have a default value, does not make a new 
-	 * attribute with the default value and the original prefix appear, since the 
-	 * <CODE>namespaceURI</CODE> and <CODE>localName</CODE> do not change.
-	 *
-	 * @param prefix The prefix of this node.
-	 * @exception DOMException
-	 *	 INVALID_CHARACTER_ERR: Raised if the specified prefix contains
-	 *							an illegal character.
-	 * <br>
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 * <br>
-	 *	 NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is 
-	 *		 malformed, if the specified prefix is "xml" and the 
-	 *		 <CODE>namespaceURI</CODE> of this node is different from 
-	 *		 "http://www.w3.org/XML/1998/namespace", if specified prefix is 
-	 *		 "xmlns" and the <CODE>namespaceURI</CODE> is neither 
-	 *		 <CODE>null</CODE> nor an empty string, or if the 
-	 *		 <CODE>localName</CODE> is <CODE>null</CODE>.
-	 */
-	virtual void
-	setPrefix(const XalanDOMString&	prefix) = 0;
-
-	/**
 	 * Determine if the document is node-order indexed.
 	 *
 	 * @return true if the document is indexed, otherwise false.
@@ -396,21 +191,11 @@
 	virtual IndexType
 	getIndex() const = 0;
 
-	//@}
-
 	// These interfaces are inherited from XalanCharacterData...
 
-	/** @name Getter functions. */
-	//@{
 	/**
 	 * Returns the character data of the node that implements this interface. 
 	 *
-	 * The DOM implementation may not put arbitrary limits on the amount of data that 
-	 * may be stored in a  <code>CharacterData</code> node. However, 
-	 * implementation limits may  mean that the entirety of a node's data may 
-	 * not fit into a single <code>XalanDOMString</code>. In such cases, the user 
-	 * may call <code>substringData</code> to retrieve the data in 
-	 * appropriately sized pieces.
 	 * @exception DOMException
 	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
 	 * @exception DOMException
@@ -421,142 +206,8 @@
 	virtual const XalanDOMString&
 	getData() const = 0;
 
-	/**
-	 * Returns the number of characters that are available through <code>data</code> and 
-	 * the <code>substringData</code> method below. 
-	 *
-	 * This may have the value 
-	 * zero, i.e., <code>CharacterData</code> nodes may be empty.
-	 */
-	virtual unsigned int
-	getLength() const = 0;
-
-	/**
-	 * Extracts a range of data from the node.
-	 *
-	 * @param offset Start offset of substring to extract.
-	 * @param count The number of characters to extract.
-	 * @return The specified substring. If the sum of <code>offset</code> and 
-	 *	 <code>count</code> exceeds the <code>length</code>, then all 
-	 *	 characters to the end of the data are returned.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does not 
-	 *	 fit into a <code>XalanDOMString</code>.
-	 */
-	virtual XalanDOMString&
-	substringData(
-			unsigned int	offset, 
-			unsigned int	count,
-            XalanDOMString& theResult) const = 0;
-
-	//@}
-	/** @name Functions that set or change data. */
-	//@{
-	/**
-	 * Append the string to the end of the character data of the node.
-	 *
-	 * Upon success, <code>data</code> provides access to the concatenation of 
-	 * <code>data</code> and the <code>XalanDOMString</code> specified.
-	 * @param arg The <code>XalanDOMString</code> to append.
-	 * @exception DOMException
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	appendData(const XalanDOMString&	arg) = 0;
-
-	/**
-	 * Insert a string at the specified character offset.
-	 *
-	 * @param offset The character offset at which to insert.
-	 * @param arg The <code>XalanDOMString</code> to insert.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	insertData(
-			unsigned int			offset,
-			const  XalanDOMString& 	arg) = 0;
-
-	/**
-	 * Remove a range of characters from the node. 
-	 *
-	 * Upon success, 
-	 * <code>data</code> and <code>length</code> reflect the change.
-	 * @param offset The offset from which to remove characters.
-	 * @param count The number of characters to delete. If the sum of 
-	 *	 <code>offset</code> and <code>count</code> exceeds <code>length</code> 
-	 *	 then all characters from <code>offset</code> to the end of the data 
-	 *	 are deleted.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	deleteData(
-			unsigned int	offset, 
-			unsigned int	count) = 0;
-
-	/**
-	 * Replace the characters starting at the specified character offset with 
-	 * the specified string.
-	 *
-	 * @param offset The offset from which to start replacing.
-	 * @param count The number of characters to replace. If the sum of 
-	 *	 <code>offset</code> and <code>count</code> exceeds <code>length</code>
-	 *	 , then all characters to the end of the data are replaced (i.e., the 
-	 *	 effect is the same as a <code>remove</code> method call with the same 
-	 *	 range, followed by an <code>append</code> method invocation).
-	 * @param arg The <code>XalanDOMString</code> with which the range must be 
-	 *	 replaced.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	replaceData(
-			unsigned int			offset, 
-			unsigned int			count, 
-			const XalanDOMString&	arg) = 0;
-
-  //@}
-
 	// These interfaces are new to XalanText...
 
-    //@}
-    /** @name Functions to modify the Text node. */
-    //@{
-
-    /**
-     * Breaks this node into two nodes at the specified 
-     * offset, keeping both in the tree as siblings. 
-     *
-     * This node then only 
-     * contains all the content up to the <code>offset</code> point. And a new 
-     * node of the same nodeType, which is inserted as the next sibling of this 
-     * node, contains all the content at and after the <code>offset</code> 
-     * point. When the <code>offset</code> is equal to the lenght of this node,
-     * the new node has no data.
-     * @param offset The offset at which to split, starting from 0.
-     * @return The new <code>Text</code> node.
-     * @exception DOMException
-     *   INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-     *   than the number of characters in <code>data</code>.
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     */
-    virtual XalanText*
-	splitText(unsigned int	offset) = 0;
-
-    //@}
-
     /**
      * Determine whether the text node instance is composed entirely of
      * XML whitespace.
@@ -564,7 +215,7 @@
      * @return true if the node is all XML whitespace, false if not
      */
 	virtual bool
-	isIgnorableWhitespace() const = 0;
+	isWhitespace() const = 0;
 
 protected:
 

Modified: xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExe/XalanExe.cpp Sat Jul 12 23:16:42 2008
@@ -829,6 +829,8 @@
 {
 public:
 
+    typedef XALAN_CPP_NAMESPACE_QUALIFIER XalanSize_t   XalanSize_t;
+
     WindowsMemoryManager() :
         MemoryManager(),
         m_handle(HeapCreate(HEAP_NO_SERIALIZE, 0, 0))
@@ -850,7 +852,7 @@
       * Returns a pointer to the allocated memory
       */
     virtual void*
-    allocate(size_t  size)
+    allocate(XalanSize_t    size)
     {
         void* const     value =
                 HeapAlloc(m_handle, HEAP_NO_SERIALIZE, size);

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.cpp Sat Jul 12 23:16:42 2008
@@ -59,22 +59,6 @@
 }
 
 
-
-XalanSourceTreeAttr::XalanSourceTreeAttr(
-			const XalanSourceTreeAttr&		theSource,
-			bool							/* deep */) :
-	XalanAttr(theSource),
-	m_name(theSource.m_name),
-	m_value(theSource.m_value),
-	m_ownerElement(0),
-	m_index(0)
-{
-	// Deep copy is the same as shallow copy -- The owning element
-	// must deal with the hookup of the siblings.
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeAttr::getNodeName() const
 {
@@ -110,9 +94,6 @@
 const XalanNodeList*
 XalanSourceTreeAttr::getChildNodes() const
 {
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
 	return 0;
 }
 
@@ -168,103 +149,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeAttr*
-#endif
-XalanSourceTreeAttr::cloneNode(bool		/* deep */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeAttr::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeAttr::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeAttr::removeChild(XalanNode*		/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeAttr::appendChild(XalanNode*		/* newChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-bool
-XalanSourceTreeAttr::hasChildNodes() const
-{
-	return false;
-}
-
-
-
-void
-XalanSourceTreeAttr::setNodeValue(const XalanDOMString&		/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeAttr::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeAttr::isSupported(
-			const XalanDOMString&	/* feature */,
-			const XalanDOMString&	/* version */) const
-{
-	return false;
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeAttr::getNamespaceURI() const
 {
@@ -289,14 +173,6 @@
 
 
 
-void
-XalanSourceTreeAttr::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XalanSourceTreeAttr::isIndexed() const
 {
@@ -337,14 +213,6 @@
 
 
 
-void
-XalanSourceTreeAttr::setValue(const XalanDOMString&		/* value */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 XalanElement*
 XalanSourceTreeAttr::getOwnerElement() const
 {

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttr.hpp Sat Jul 12 23:16:42 2008
@@ -76,409 +76,63 @@
 	virtual const XalanDOMString&
 	getNodeName() const;
 
-	/**
-	 * Gets the value of this node, depending on its type.
-	 */
 	virtual const XalanDOMString&
 	getNodeValue() const;
 
-	/**
-	 * An enum value representing the type of the underlying object.
-	 */
 	virtual NodeType
 	getNodeType() const;
 
-	/**
-	 * Gets the parent of this node.
-	 *
-	 * All nodes, except <code>Document</code>,
-	 * <code>DocumentFragment</code>, and <code>Attr</code> may have a parent.
-	 * However, if a node has just been created and not yet added to the tree,
-	 * or if it has been removed from the tree, a <code>null</code> Node
-	 * is returned.
-	 */
 	virtual XalanNode*
 	getParentNode() const;
 
-	/**
-	 * Gets a <code>NodeList</code> that contains all children of this node.
-	 *
-	 * If there
-	 * are no children, this is a <code>NodeList</code> containing no nodes.
-	 * The content of the returned <code>NodeList</code> is "live" in the sense
-	 * that, for instance, changes to the children of the node object that
-	 * it was created from are immediately reflected in the nodes returned by
-	 * the <code>NodeList</code> accessors; it is not a static snapshot of the
-	 * content of the node. This is true for every <code>NodeList</code>,
-	 * including the ones returned by the <code>getElementsByTagName</code>
-	 * method.
-	 */
 	virtual const XalanNodeList*
 	getChildNodes() const;
 
-	/**
-	 * Gets the first child of this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getFirstChild() const;
 
-	/**
-	 * Gets the last child of this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getLastChild() const;
 
-	/**
-	 * Gets the node immediately preceding this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getPreviousSibling() const;
 
-	/**
-	 * Gets the node immediately following this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getNextSibling() const;
 
-	/**
-	 * Gets a <code>NamedNodeMap</code> containing the attributes of this node (if it
-	 * is an <code>Element</code>) or <code>null</code> otherwise.
-	 */
 	virtual const XalanNamedNodeMap*
 	getAttributes() const;
 
-	/**
-	 * Gets the <code>Document</code> object associated with this node.
-	 *
-	 * This is also
-	 * the <code>Document</code> object used to create new nodes. When this
-	 * node is a <code>Document</code> or a <code>DocumentType</code>
-	 * which is not used with any <code>Document</code> yet, this is
-	 * <code>null</code>.
-	 */
 	virtual XalanDocument*
 	getOwnerDocument() const;
 
-	//@}
-	/** @name Cloning function. */
-	//@{
-
-	/**
-	 * Returns a duplicate of this node.
-	 *
-	 * This function serves as a generic copy constructor for nodes.
-	 *
-	 * The duplicate node has no parent (
-	 * <code>parentNode</code> returns <code>null</code>.).
-	 * <br>Cloning an <code>Element</code> copies all attributes and their
-	 * values, including those generated by the  XML processor to represent
-	 * defaulted attributes, but this method does not copy any text it contains
-	 * unless it is a deep clone, since the text is contained in a child
-	 * <code>Text</code> node. Cloning any other type of node simply returns a
-	 * copy of this node.
-	 * @param deep If <code>true</code>, recursively clone the subtree under the
-	 *	 specified node; if <code>false</code>, clone only the node itself (and
-	 *	 its attributes, if it is an <code>Element</code>).
-	 * @return The duplicate node.
-	 */
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanSourceTreeAttr*
-#endif
-	cloneNode(bool deep) const;
-
-	//@}
-	/** @name Functions to modify the DOM Node. */
-	//@{
-
-	/**
-	 * Inserts the node <code>newChild</code> before the existing child node
-	 * <code>refChild</code>.
-	 *
-	 * If <code>refChild</code> is <code>null</code>,
-	 * insert <code>newChild</code> at the end of the list of children.
-	 * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
-	 * all of its children are inserted, in the same order, before
-	 * <code>refChild</code>. If the <code>newChild</code> is already in the
-	 * tree, it is first removed.  Note that a <code>Node</code> that
-	 * has never been assigned to refer to an actual node is == null.
-	 * @param newChild The node to insert.
-	 * @param refChild The reference node, i.e., the node before which the new
-	 *	 node must be inserted.
-	 * @return The node being inserted.
-	 */
-	virtual XalanNode*
-	insertBefore(
-			XalanNode*	newChild,
-			XalanNode*	refChild);
-
-	/**
-	 * Replaces the child node <code>oldChild</code> with <code>newChild</code>
-	 * in the list of children, and returns the <code>oldChild</code> node.
-	 *
-	 * If <CODE>newChild</CODE> is a <CODE>DocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DocumentFragment</CODE>
-	 * children, which are inserted in the same order.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is first removed.
-	 * @param newChild The new node to put in the child list.
-	 * @param oldChild The node being replaced in the list.
-	 * @return The node replaced.
-	 */
-	virtual XalanNode*
-	replaceChild(
-			XalanNode*	newChild,
-			XalanNode*	oldChild);
-
-	/**
-	 * Removes the child node indicated by <code>oldChild</code> from the list
-	 * of children, and returns it.
-	 *
-	 * @param oldChild The node being removed.
-	 * @return The node removed.
-	 */
-	virtual XalanNode*
-	removeChild(XalanNode*	oldChild);
-
-	/**
-	 * Adds the node <code>newChild</code> to the end of the list of children of
-	 * this node.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is
-	 * first removed.
-	 * @param newChild The node to add.If it is a  <code>DocumentFragment</code>
-	 *	 object, the entire contents of the document fragment are moved into
-	 *	 the child list of this node
-	 * @return The node added.
-	 */
-	virtual XalanNode*
-	appendChild(XalanNode*	newChild);
-
-	//@}
-	/** @name Query functions. */
-	//@{
-
-	/**
-	 *	This is a convenience method to allow easy determination of whether a
-	 * node has any children.
-	 *
-	 * @return	<code>true</code> if the node has any children,
-	 *	 <code>false</code> if the node has no children.
-	 */
-	virtual bool
-	hasChildNodes() const;
-
-
-	//@}
-	/** @name Set functions. */
-	//@{
-
-
-	/**
-	* Sets the value of the node.
-	*
-	* Any node which can have a nodeValue (@see getNodeValue) will
-	* also accept requests to set it to a string. The exact response to
-	* this varies from node to node -- Attribute, for example, stores
-	* its values in its children and has to replace them with a new Text
-	* holding the replacement value.
-	*
-	* For most types of Node, value is null and attempting to set it
-	* will throw DOMException(NO_MODIFICATION_ALLOWED_ERR). This will
-	* also be thrown if the node is read-only.
-	*/
-	virtual void
-	setNodeValue(const XalanDOMString&	nodeValue);
-
-	//@}
-	/** @name Functions introduced in DOM Level 2. */
-	//@{
-
-	/**
-	 * Puts all <CODE>Text</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>Node</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>Text</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>Text</CODE>
-	 * nodes. This can be used to ensure that the DOM view of a document is the 
-	 * same as if it were saved and re-loaded, and is useful when operations 
-	 * (such as XPointer lookups) that depend on a particular document tree 
-	 * structure are to be used.
-	 * <P><B>Note:</B> In cases where the document contains <CODE>CDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>Text</CODE>
-	 * nodes and <CODE>CDATASection</CODE> nodes.</P>
-	 */
-	virtual void
-	normalize();
-
-	/**
-	 * Tests whether the DOM implementation implements a specific
-	 * feature and that feature is supported by this node.
-	 * @param feature The string of the feature to test. This is the same
-	 * name as what can be passed to the method <code>hasFeature</code> on
-	 * <code>DOMImplementation</code>.
-	 * @param version This is the version number of the feature to test. In
-	 * Level 2, version 1, this is the string "2.0". If the version is not
-	 * specified, supporting any version of the feature will cause the
-	 * method to return <code>true</code>.
-	 * @return Returns <code>true</code> if the specified feature is supported
-	 * on this node, <code>false</code> otherwise.
-	 */
-	virtual bool
-	isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const;
-
-	/**
-	 * Get the <em>namespace URI</em> of
-	 * this node, or <code>null</code> if it is unspecified.
-	 * <p>
-	 * This is not a computed value that is the result of a namespace lookup
-	 * based on an examination of the namespace declarations in scope. It is
-	 * merely the namespace URI given at creation time.
-	 * <p>
-	 * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and 
-	 * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method, 
-	 * such as <CODE>createElement</CODE> from the <CODE>Document</CODE>
-	 * interface, this is always <CODE>null</CODE>.
-	 */
 	virtual const XalanDOMString&
 	getNamespaceURI() const;
 
-	/**
-	 * Get the <em>namespace prefix</em>
-	 * of this node, or <code>null</code> if it is unspecified.
-	 */
 	virtual const XalanDOMString&
 	getPrefix() const;
 
-	/**
-	 * Returns the local part of the <em>qualified name</em> of this node.
-	 * <p>
-	 * For nodes created with a DOM Level 1 method, such as
-	 * <code>createElement</code> from the <code>Document</code> interface,
-	 * it is null.
-	 */
 	virtual const XalanDOMString&
 	getLocalName() const;
 
-	/**
-	 * Set the <em>namespace prefix</em> of this node.
-	 * <p>
-	 * Note that setting this attribute, when permitted, changes 
-	 * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified 
-	 * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE> 
-	 * attributes of the <CODE>Element</CODE> and <CODE>Attr</CODE>
-	 * interfaces, when applicable.
-	 * <p>
-	 * Note also that changing the prefix of an 
-	 * attribute, that is known to have a default value, does not make a new 
-	 * attribute with the default value and the original prefix appear, since the 
-	 * <CODE>namespaceURI</CODE> and <CODE>localName</CODE> do not change.
-	 *
-	 * @param prefix The prefix of this node.
-	 * @exception DOMException
-	 *	 INVALID_CHARACTER_ERR: Raised if the specified prefix contains
-	 *							an illegal character.
-	 * <br>
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 * <br>
-	 *	 NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is 
-	 *		 malformed, if the specified prefix is "xml" and the 
-	 *		 <CODE>namespaceURI</CODE> of this node is different from 
-	 *		 "http://www.w3.org/XML/1998/namespace", if specified prefix is 
-	 *		 "xmlns" and the <CODE>namespaceURI</CODE> is neither 
-	 *		 <CODE>null</CODE> nor an empty string, or if the 
-	 *		 <CODE>localName</CODE> is <CODE>null</CODE>.
-	 */
-	virtual void
-	setPrefix(const XalanDOMString&		prefix);
-
-	/**
-	 * Determine if the document is node-order indexed.
-	 *
-	 * @return true if the document is indexed, otherwise false.
-	 */
 	virtual bool
 	isIndexed() const;
 
-	/**
-	 * Get the node's index.  Valid only if the owner document
-	 * reports that the document is node-order indexed.
-	 *
-	 * @return The index value, or 0 if the node is not indexed.
-	 */
 	virtual IndexType
 	getIndex() const;
 
-	//@}
-
-	// These interfaces are inherited from XalanAttr...
-
-	/** @name Getter functions */
-	 //@{
-    /**
-
-	* Returns the name of this attribute. 
-    */
+    // These interfaces are inherited from XalanAttr...
     virtual const XalanDOMString&
 	getName() const;
 
-	/**
-	 *
-     * Returns true if the attribute received its value explicitly in the
-     * XML document, or if a value was assigned programatically with
-     * the setValue function.  Returns false if the attribute value 
-     * came from the default value declared in the document's DTD.
-     */
     virtual bool
 	getSpecified() const;
 
-    /**
-	 * Returns the value of the attribute.
-	 *
-     * The value of the attribute is returned as a string. 
-     * Character and general entity references are replaced with their values.
-     */
     virtual const XalanDOMString&
 	getValue() const;
 
-	//@}
-	/** @name Setter functions */
-	//@{
-    
-	/**
-	 * Sets the value of the attribute.  A text node with the unparsed contents
-     * of the string will be created.
-	 *
-     * @param value The value of the DOM attribute to be set
-     */
-    virtual void
-	setValue(const XalanDOMString&	value);
-
-	//@}
-
-    /** @name Functions introduced in DOM Level 2. */
-    //@{
-    /**
-     * The <code>Element</code> node this attribute is attached to or
-     * <code>null</code> if this attribute is not in use.
-     */
     virtual XalanElement*
 	getOwnerElement() const;
-    //@}
-
 
 	// public interfaces not inherited from XalanAttr...
 
@@ -494,16 +148,12 @@
 		m_index = theIndex;
 	}
 
-protected:
-
-	XalanSourceTreeAttr(
-			const XalanSourceTreeAttr&	theSource,
-			bool						deep = false);
-
 private:
 
 	// Not defined...
-	XalanSourceTreeAttr&
+	XalanSourceTreeAttr(const XalanSourceTreeAttr&		theSource);
+
+    XalanSourceTreeAttr&
 	operator=(const XalanSourceTreeAttr&	theSource);
 
 	bool

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.cpp Sat Jul 12 23:16:42 2008
@@ -53,46 +53,6 @@
 }
 
 
-
-XalanSourceTreeAttrNS::XalanSourceTreeAttrNS(
-			const XalanSourceTreeAttrNS&	theSource,
-			bool							deep) :
-	XalanSourceTreeAttr(theSource, deep),
-	m_localName(theSource.m_localName),
-	m_prefix(theSource.m_prefix),
-	m_namespaceURI(theSource.m_namespaceURI)
-{
-}
-
-
-
-XalanSourceTreeAttrNS::XalanSourceTreeAttrNS(
-			const XalanSourceTreeAttr&	theSource,
-			bool						deep) :
-	XalanSourceTreeAttr(theSource, deep),
-	m_localName(theSource.getLocalName()),
-	m_prefix(theSource.getPrefix()),
-	m_namespaceURI(theSource.getNamespaceURI())
-{
-}
-
-
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeAttrNS*
-#endif
-XalanSourceTreeAttrNS::cloneNode(bool	/* deep */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeAttrNS::getNamespaceURI() const
 {

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeAttrNS.hpp Sat Jul 12 23:16:42 2008
@@ -68,13 +68,6 @@
 	~XalanSourceTreeAttrNS();
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanSourceTreeAttrNS*
-#endif
-	cloneNode(bool deep) const;
-
 	virtual const XalanDOMString&
 	getNamespaceURI() const;
 
@@ -84,19 +77,11 @@
 	virtual const XalanDOMString&
 	getLocalName() const;
 
-protected:
-
-	XalanSourceTreeAttrNS(
-			const XalanSourceTreeAttrNS&	theSource,
-			bool							deep = false);
-
-	XalanSourceTreeAttrNS(
-			const XalanSourceTreeAttr&	theSource,
-			bool						deep = false);
-
 private:
 
 	// Not defined...
+	XalanSourceTreeAttrNS(const XalanSourceTreeAttrNS&		theSource);
+
 	XalanSourceTreeAttrNS&
 	operator=(const XalanSourceTreeAttrNS&	theSource);
 

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.cpp Sat Jul 12 23:16:42 2008
@@ -70,20 +70,6 @@
 
 
 
-XalanSourceTreeComment::XalanSourceTreeComment(
-			const XalanSourceTreeComment&	theSource,
-			bool							/* deep */) :
-	XalanComment(theSource),
-	m_data(theSource.m_data),
-	m_parentNode(0),
-	m_previousSibling(0),
-	m_nextSibling(0),
-	m_index(0)
-{
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeComment::getNodeName() const
 {
@@ -186,103 +172,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeComment*
-#endif
-XalanSourceTreeComment::cloneNode(bool	/* deep */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeComment::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeComment::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeComment::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeComment::appendChild(XalanNode*	/* newChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-bool
-XalanSourceTreeComment::hasChildNodes() const
-{
-	return false;
-}
-
-
-
-void
-XalanSourceTreeComment::setNodeValue(const XalanDOMString&		/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeComment::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeComment::isSupported(
-			const XalanDOMString&	/* feature */,
-			const XalanDOMString&	/* version */) const
-{
-	return false;
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeComment::getNamespaceURI() const
 {
@@ -307,14 +196,6 @@
 
 
 
-void
-XalanSourceTreeComment::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XalanSourceTreeComment::isIndexed() const
 {
@@ -339,67 +220,6 @@
 
 
 
-unsigned int
-XalanSourceTreeComment::getLength() const
-{
-	assert(unsigned(length(m_data)) == length(m_data));
-
-	return unsigned(length(m_data));
-}
-
-
-
-XalanDOMString&
-XalanSourceTreeComment::substringData(
-			unsigned int	offset,
-			unsigned int	count,
-            XalanDOMString& theBuffer) const
-{
-
-	return m_data.substr(theBuffer, offset, count);
-}
-
-
-
-void
-XalanSourceTreeComment::appendData(const XalanDOMString&	/* arg */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeComment::insertData(
-			unsigned int			/* offset */,
-			const  XalanDOMString& 	/* arg */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeComment::deleteData(
-			unsigned int	/* offset */,
-			unsigned int	/* count */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeComment::replaceData(
-			unsigned int			/* offset */,
-			unsigned int			/* count */,
-			const XalanDOMString&	/* arg */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 void
 XalanSourceTreeComment::setParent(XalanSourceTreeElement*	theParent)
 {

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeComment.hpp Sat Jul 12 23:16:42 2008
@@ -44,14 +44,6 @@
 
 
 
-/*
- * <meta name="usage" content="experimental"/>
- *
- * Base class for the Xalan source tree Attr interface.
- *
- * This class is experimental and subject to change!!
- */
-
 class XALAN_XALANSOURCETREE_EXPORT XalanSourceTreeComment : public XalanComment
 {
 public:
@@ -90,481 +82,58 @@
 	virtual
 	~XalanSourceTreeComment();
 
-
-	/**
-	 * Gets the name of this node.
-	 */
+    // These interfaces are inherited from XalanComment
 	virtual const XalanDOMString&
 	getNodeName() const;
 
-	/**
-	 * Gets the value of this node, depending on its type.
-	 */
 	virtual const XalanDOMString&
 	getNodeValue() const;
 
-	/**
-	 * An enum value representing the type of the underlying object.
-	 */
 	virtual NodeType
 	getNodeType() const;
 
-	/**
-	 * Gets the parent of this node.
-	 *
-	 * All nodes, except <code>Document</code>,
-	 * <code>DocumentFragment</code>, and <code>Attr</code> may have a parent.
-	 * However, if a node has just been created and not yet added to the tree,
-	 * or if it has been removed from the tree, a <code>null</code> DOM_Node
-	 * is returned.
-	 */
 	virtual XalanNode*
 	getParentNode() const;
 
-	/**
-	 * Gets a <code>NodeList</code> that contains all children of this node.
-	 *
-	 * If there
-	 * are no children, this is a <code>NodeList</code> containing no nodes.
-	 * The content of the returned <code>NodeList</code> is "live" in the sense
-	 * that, for instance, changes to the children of the node object that
-	 * it was created from are immediately reflected in the nodes returned by
-	 * the <code>NodeList</code> accessors; it is not a static snapshot of the
-	 * content of the node. This is true for every <code>NodeList</code>,
-	 * including the ones returned by the <code>getElementsByTagName</code>
-	 * method.
-	 */
 	virtual const XalanNodeList*
 	getChildNodes() const;
 
-	/**
-	 * Gets the first child of this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getFirstChild() const;
 
-	/**
-	 * Gets the last child of this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getLastChild() const;
 
-	/**
-	 * Gets the node immediately preceding this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getPreviousSibling() const;
 
-	/**
-	 * Gets the node immediately following this node.
-	 *
-	 * If there is no such node, this returns <code>null</code>.
-	 */
 	virtual XalanNode*
 	getNextSibling() const;
 
-	/**
-	 * Gets a <code>NamedNodeMap</code> containing the attributes of this node (if it
-	 * is an <code>Element</code>) or <code>null</code> otherwise.
-	 */
 	virtual const XalanNamedNodeMap*
 	getAttributes() const;
 
-	/**
-	 * Gets the <code>DOM_Document</code> object associated with this node.
-	 *
-	 * This is also
-	 * the <code>DOM_Document</code> object used to create new nodes. When this
-	 * node is a <code>DOM_Document</code> or a <code>DOM_DocumentType</code>
-	 * which is not used with any <code>DOM_Document</code> yet, this is
-	 * <code>null</code>.
-	 */
 	virtual XalanDocument*
 	getOwnerDocument() const;
 
-	//@}
-	/** @name Cloning function. */
-	//@{
-
-	/**
-	 * Returns a duplicate of this node.
-	 *
-	 * This function serves as a generic copy constructor for nodes.
-	 *
-	 * The duplicate node has no parent (
-	 * <code>parentNode</code> returns <code>null</code>.).
-	 * <br>Cloning an <code>Element</code> copies all attributes and their
-	 * values, including those generated by the  XML processor to represent
-	 * defaulted attributes, but this method does not copy any text it contains
-	 * unless it is a deep clone, since the text is contained in a child
-	 * <code>Text</code> node. Cloning any other type of node simply returns a
-	 * copy of this node.
-	 * @param deep If <code>true</code>, recursively clone the subtree under the
-	 *	 specified node; if <code>false</code>, clone only the node itself (and
-	 *	 its attributes, if it is an <code>Element</code>).
-	 * @return The duplicate node.
-	 */
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanSourceTreeComment*
-#endif
-	cloneNode(bool deep) const;
-
-	//@}
-	/** @name Functions to modify the DOM Node. */
-	//@{
-
-	/**
-	 * Inserts the node <code>newChild</code> before the existing child node
-	 * <code>refChild</code>.
-	 *
-	 * If <code>refChild</code> is <code>null</code>,
-	 * insert <code>newChild</code> at the end of the list of children.
-	 * <br>If <code>newChild</code> is a <code>DocumentFragment</code> object,
-	 * all of its children are inserted, in the same order, before
-	 * <code>refChild</code>. If the <code>newChild</code> is already in the
-	 * tree, it is first removed.  Note that a <code>DOM_Node</code> that
-	 * has never been assigned to refer to an actual node is == null.
-	 * @param newChild The node to insert.
-	 * @param refChild The reference node, i.e., the node before which the new
-	 *	 node must be inserted.
-	 * @return The node being inserted.
-	 */
-	virtual XalanNode*
-	insertBefore(
-			XalanNode*	newChild,
-			XalanNode*	refChild);
-
-	/**
-	 * Replaces the child node <code>oldChild</code> with <code>newChild</code>
-	 * in the list of children, and returns the <code>oldChild</code> node.
-	 *
-	 * If <CODE>newChild</CODE> is a <CODE>DOM_DocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DOM_DocumentFragment</CODE>
-	 * children, which are inserted in the same order.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is first removed.
-	 * @param newChild The new node to put in the child list.
-	 * @param oldChild The node being replaced in the list.
-	 * @return The node replaced.
-	 */
-	virtual XalanNode*
-	replaceChild(
-			XalanNode*	newChild,
-			XalanNode*	oldChild);
-
-	/**
-	 * Removes the child node indicated by <code>oldChild</code> from the list
-	 * of children, and returns it.
-	 *
-	 * @param oldChild The node being removed.
-	 * @return The node removed.
-	 */
-	virtual XalanNode*
-	removeChild(XalanNode*	oldChild);
-
-	/**
-	 * Adds the node <code>newChild</code> to the end of the list of children of
-	 * this node.
-	 *
-	 * If the <code>newChild</code> is already in the tree, it is
-	 * first removed.
-	 * @param newChild The node to add.If it is a  <code>DocumentFragment</code>
-	 *	 object, the entire contents of the document fragment are moved into
-	 *	 the child list of this node
-	 * @return The node added.
-	 */
-	virtual XalanNode*
-	appendChild(XalanNode*	newChild);
-
-	//@}
-	/** @name Query functions. */
-	//@{
-
-	/**
-	 *	This is a convenience method to allow easy determination of whether a
-	 * node has any children.
-	 *
-	 * @return	<code>true</code> if the node has any children,
-	 *	 <code>false</code> if the node has no children.
-	 */
-	virtual bool
-	hasChildNodes() const;
-
-
-	//@}
-	/** @name Set functions. */
-	//@{
-
-	/**
-	* Sets the value of the node.
-	*
-	* Any node which can have a nodeValue (@see getNodeValue) will
-	* also accept requests to set it to a string. The exact response to
-	* this varies from node to node -- Attribute, for example, stores
-	* its values in its children and has to replace them with a new Text
-	* holding the replacement value.
-	*
-	* For most types of Node, value is null and attempting to set it
-	* will throw DOMException(NO_MODIFICATION_ALLOWED_ERR). This will
-	* also be thrown if the node is read-only.
-	*/
-	virtual void
-	setNodeValue(const XalanDOMString&		nodeValue);
-
-	//@}
-	/** @name Functions introduced in DOM Level 2. */
-	//@{
-
-	/**
-	 * Puts all <CODE>DOM_Text</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>DOM_Node</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>DOM_Text</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>DOM_Text</CODE>
-	 * nodes. This can be used to ensure that the DOM view of a document is the 
-	 * same as if it were saved and re-loaded, and is useful when operations 
-	 * (such as XPointer lookups) that depend on a particular document tree 
-	 * structure are to be used.
-	 * <P><B>Note:</B> In cases where the document contains <CODE>DOM_CDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>DOM_Text</CODE>
-	 * nodes and <CODE>DOM_CDATASection</CODE> nodes.</P>
-	 */
-	virtual void
-	normalize();
-
-	/**
-	 * Tests whether the DOM implementation implements a specific
-	 * feature and that feature is supported by this node.
-	 * @param feature The string of the feature to test. This is the same
-	 * name as what can be passed to the method <code>hasFeature</code> on
-	 * <code>DOMImplementation</code>.
-	 * @param version This is the version number of the feature to test. In
-	 * Level 2, version 1, this is the string "2.0". If the version is not
-	 * specified, supporting any version of the feature will cause the
-	 * method to return <code>true</code>.
-	 * @return Returns <code>true</code> if the specified feature is supported
-	 * on this node, <code>false</code> otherwise.
-	 */
-	virtual bool
-	isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const;
-
-	/**
-	 * Get the <em>namespace URI</em> of
-	 * this node, or <code>null</code> if it is unspecified.
-	 * <p>
-	 * This is not a computed value that is the result of a namespace lookup
-	 * based on an examination of the namespace declarations in scope. It is
-	 * merely the namespace URI given at creation time.
-	 * <p>
-	 * For nodes of any type other than <CODE>ELEMENT_NODE</CODE> and 
-	 * <CODE>ATTRIBUTE_NODE</CODE> and nodes created with a DOM Level 1 method, 
-	 * such as <CODE>createElement</CODE> from the <CODE>Document</CODE>
-	 * interface, this is always <CODE>null</CODE>.
-	 */
 	virtual const XalanDOMString&
 	getNamespaceURI() const;
 
-	/**
-	 * Get the <em>namespace prefix</em>
-	 * of this node, or <code>null</code> if it is unspecified.
-	 */
 	virtual const XalanDOMString&
 	getPrefix() const;
 
-	/**
-	 * Returns the local part of the <em>qualified name</em> of this node.
-	 * <p>
-	 * For nodes created with a DOM Level 1 method, such as
-	 * <code>createElement</code> from the <code>DOM_Document</code> interface,
-	 * it is null.
-	 */
 	virtual const XalanDOMString&
 	getLocalName() const;
 
-	/**
-	 * Set the <em>namespace prefix</em> of this node.
-	 * <p>
-	 * Note that setting this attribute, when permitted, changes 
-	 * the <CODE>nodeName</CODE> attribute, which holds the <EM>qualified 
-	 * name</EM>, as well as the <CODE>tagName</CODE> and <CODE>name</CODE> 
-	 * attributes of the <CODE>DOM_Element</CODE> and <CODE>DOM_Attr</CODE>
-	 * interfaces, when applicable.
-	 * <p>
-	 * Note also that changing the prefix of an 
-	 * attribute, that is known to have a default value, does not make a new 
-	 * attribute with the default value and the original prefix appear, since the 
-	 * <CODE>namespaceURI</CODE> and <CODE>localName</CODE> do not change.
-	 *
-	 * @param prefix The prefix of this node.
-	 * @exception DOMException
-	 *	 INVALID_CHARACTER_ERR: Raised if the specified prefix contains
-	 *							an illegal character.
-	 * <br>
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 * <br>
-	 *	 NAMESPACE_ERR: Raised if the specified <CODE>prefix</CODE> is 
-	 *		 malformed, if the specified prefix is "xml" and the 
-	 *		 <CODE>namespaceURI</CODE> of this node is different from 
-	 *		 "http://www.w3.org/XML/1998/namespace", if specified prefix is 
-	 *		 "xmlns" and the <CODE>namespaceURI</CODE> is neither 
-	 *		 <CODE>null</CODE> nor an empty string, or if the 
-	 *		 <CODE>localName</CODE> is <CODE>null</CODE>.
-	 */
-	virtual void
-	setPrefix(const XalanDOMString&	prefix);
-
 	virtual bool
 	isIndexed() const;
 
 	virtual IndexType
 	getIndex() const;
 
-	//@}
-
-	// These interfaces are inherited from XalanCDATASection...
-
-	/** @name Getter functions. */
-	//@{
-	/**
-	 * Returns the character data of the node that implements this interface. 
-	 *
-	 * The DOM implementation may not put arbitrary limits on the amount of data that 
-	 * may be stored in a  <code>CharacterData</code> node. However, 
-	 * implementation limits may  mean that the entirety of a node's data may 
-	 * not fit into a single <code>DOMString</code>. In such cases, the user 
-	 * may call <code>substringData</code> to retrieve the data in 
-	 * appropriately sized pieces.
-	 * @exception DOMException
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
-	 * @exception DOMException
-	 *	 DOMSTRING_SIZE_ERR: Raised when it would return more characters than 
-	 *	 fit in a <code>DOMString</code> variable on the implementation 
-	 *	 platform.
-	 */
 	virtual const XalanDOMString&
 	getData() const;
 
-	/**
-	 * Returns the number of characters that are available through <code>data</code> and 
-	 * the <code>substringData</code> method below. 
-	 *
-	 * This may have the value 
-	 * zero, i.e., <code>CharacterData</code> nodes may be empty.
-	 */
-	virtual unsigned int
-	getLength() const;
-
-	/**
-	 * Extracts a range of data from the node.
-	 *
-	 * @param offset Start offset of substring to extract.
-	 * @param count The number of characters to extract.
-	 * @return The specified substring. If the sum of <code>offset</code> and 
-	 *	 <code>count</code> exceeds the <code>length</code>, then all 
-	 *	 characters to the end of the data are returned.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>DOMSTRING_SIZE_ERR: Raised if the specified range of text does not 
-	 *	 fit into a <code>DOMString</code>.
-	 */
-	virtual XalanDOMString&
-	substringData(
-			unsigned int	offset, 
-			unsigned int	count,
-            XalanDOMString& theBuffer) const;
-
-	//@}
-	/** @name Functions that set or change data. */
-	//@{
-	/**
-	 * Append the string to the end of the character data of the node.
-	 *
-	 * Upon success, <code>data</code> provides access to the concatenation of 
-	 * <code>data</code> and the <code>DOMString</code> specified.
-	 * @param arg The <code>DOMString</code> to append.
-	 * @exception DOMException
-	 *	 NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	appendData(const XalanDOMString&	arg);
-
-	/**
-	 * Insert a string at the specified character offset.
-	 *
-	 * @param offset The character offset at which to insert.
-	 * @param arg The <code>DOMString</code> to insert.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	insertData(
-			unsigned int			offset,
-			const  XalanDOMString& 	arg);
-
-	/**
-	 * Remove a range of characters from the node. 
-	 *
-	 * Upon success, 
-	 * <code>data</code> and <code>length</code> reflect the change.
-	 * @param offset The offset from which to remove characters.
-	 * @param count The number of characters to delete. If the sum of 
-	 *	 <code>offset</code> and <code>count</code> exceeds <code>length</code> 
-	 *	 then all characters from <code>offset</code> to the end of the data 
-	 *	 are deleted.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	deleteData(
-			unsigned int	offset, 
-			unsigned int	count);
-
-	/**
-	 * Replace the characters starting at the specified character offset with 
-	 * the specified string.
-	 *
-	 * @param offset The offset from which to start replacing.
-	 * @param count The number of characters to replace. If the sum of 
-	 *	 <code>offset</code> and <code>count</code> exceeds <code>length</code>
-	 *	 , then all characters to the end of the data are replaced (i.e., the 
-	 *	 effect is the same as a <code>remove</code> method call with the same 
-	 *	 range, followed by an <code>append</code> method invocation).
-	 * @param arg The <code>DOMString</code> with which the range must be 
-	 *	 replaced.
-	 * @exception DOMException
-	 *	 INDEX_SIZE_ERR: Raised if the specified offset is negative or greater 
-	 *	 than the number of characters in <code>data</code>, or if the 
-	 *	 specified <code>count</code> is negative.
-	 *	 <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	replaceData(
-			unsigned int			offset, 
-			unsigned int			count, 
-			const XalanDOMString&	arg);
-
-  //@}
-
-
 	// public interfaces not inherited from XalanComment...
 
 	void
@@ -603,15 +172,11 @@
 		m_index = theIndex;
 	}
 
-protected:
-
-	XalanSourceTreeComment(
-			const XalanSourceTreeComment&	theSource,
-			bool							deep = false);
-
 private:
 
 	// Not implemented...
+	XalanSourceTreeComment(const XalanSourceTreeComment&    theSource);
+
 	XalanSourceTreeComment&
 	operator=(const XalanSourceTreeComment&	theSource);
 

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp Sat Jul 12 23:16:42 2008
@@ -252,102 +252,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeDocument*
-#endif
-XalanSourceTreeDocument::cloneNode(bool		/* deep */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocument::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocument::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocument::removeChild(XalanNode*	 /* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocument::appendChild(XalanNode*		/* newChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-bool
-XalanSourceTreeDocument::hasChildNodes() const
-{
-	return m_documentElement != 0 ? true : false;
-}
-
-
-
-void
-XalanSourceTreeDocument::setNodeValue(const XalanDOMString&		/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeDocument::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-bool
-XalanSourceTreeDocument::isSupported(
-			const XalanDOMString&	/* feature */,
-			const XalanDOMString&	/* version */) const
-{
-	return false;
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeDocument::getNamespaceURI() const
 {
@@ -372,14 +276,6 @@
 
 
 
-void
-XalanSourceTreeDocument::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XalanSourceTreeDocument::isIndexed() const
 {
@@ -397,113 +293,6 @@
 
 
 XalanElement*
-XalanSourceTreeDocument::createElement(const XalanDOMString&	/* tagName */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanDocumentFragment*
-XalanSourceTreeDocument::createDocumentFragment()
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanText*
-XalanSourceTreeDocument::createTextNode(const XalanDOMString&	/* data */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanComment*
-XalanSourceTreeDocument::createComment(const XalanDOMString&	/* data */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanCDATASection*
-XalanSourceTreeDocument::createCDATASection(const XalanDOMString&	/* data */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanProcessingInstruction*
-XalanSourceTreeDocument::createProcessingInstruction(
-			const XalanDOMString&	/* target */,
-			const XalanDOMString&	/* data */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanAttr*
-XalanSourceTreeDocument::createAttribute(const XalanDOMString&	/* name */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanEntityReference*
-XalanSourceTreeDocument::createEntityReference(const XalanDOMString&	/* name */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanDocumentType*
-XalanSourceTreeDocument::getDoctype() const
-{
-	return 0;
-}
-
-
-
-
-XalanDOMImplementation*
-XalanSourceTreeDocument::getImplementation() const
-{
-	return 0;
-}
-
-
-
-XalanElement*
 XalanSourceTreeDocument::getDocumentElement() const
 {
 	return m_documentElement;
@@ -511,65 +300,6 @@
 
 
 
-XalanNodeList*
-XalanSourceTreeDocument::getElementsByTagName(const XalanDOMString&		/* tagname */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocument::importNode(
-			XalanNode*	/* importedNode */,
-			bool		/* deep */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-XalanElement*
-XalanSourceTreeDocument::createElementNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanAttr*
-XalanSourceTreeDocument::createAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */)
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNodeList*
-XalanSourceTreeDocument::getElementsByTagNameNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
 XalanElement*
 XalanSourceTreeDocument::getElementById(const XalanDOMString&	elementId) const
 {
@@ -732,11 +462,7 @@
 			XalanNode*					theNextSibling,
 			bool						fAddXMLNamespaceAttribute)
 {
-	// We might have typedef'ed this to something smaller than unsigned int.
-	AttributesCountType		theAttributeCount = AttributesCountType(attrs.getLength());
-
-	// assert that we didn't lose anything...
-	assert(theAttributeCount == attrs.getLength());
+	XalanSize_t		theAttributeCount = attrs.getLength();
 
 	if (fAddXMLNamespaceAttribute == true)
 	{
@@ -839,11 +565,7 @@
 			XalanNode*					theNextSibling,
 			bool						fAddXMLNamespaceAttribute)
 {
-	// We might have typedef'ed this to something smaller than unsigned int.
-	AttributesCountType		theAttributeCount = AttributesCountType(attrs.getLength());
-
-	// assert that we didn't lose anything...
-	assert(theAttributeCount == attrs.getLength());
+	XalanSize_t		theAttributeCount = attrs.getLength();
 
 	if (fAddXMLNamespaceAttribute == true)
 	{
@@ -955,12 +677,7 @@
 			XalanNode*				theNextSibling,
 			bool					fAddXMLNamespaceAttribute)
 {
-
-	// We might have typedef'ed this to something smaller than unsigned int.
-	AttributesCountType		theAttributeCount = AttributesCountType(attrs.getLength());
-
-	// assert that we didn't lose anything...
-	assert(theAttributeCount == attrs.getLength());
+	XalanSize_t		theAttributeCount = attrs.getLength();
 
 	if (fAddXMLNamespaceAttribute == true)
 	{
@@ -1032,11 +749,7 @@
 {
 	assert(indexOf(name, XalanUnicode::charColon) == length(name));
 
-	// We might have typedef'ed this to something smaller than unsigned int.
-	AttributesCountType		theAttributeCount = AttributesCountType(attrs.getLength());
-
-	// assert that we didn't lose anything...
-	assert(theAttributeCount == attrs.getLength());
+	XalanSize_t		theAttributeCount = attrs.getLength();
 
 	if (fAddXMLNamespaceAttribute == true)
 	{
@@ -1338,7 +1051,7 @@
 XalanSourceTreeDocument::createElementNode(
 			const XalanDOMChar*		theTagName,
 			XalanSourceTreeAttr**	theAttributeVector,
-			AttributesCountType		theAttributeCount,
+			XalanSize_t		        theAttributeCount,
 			XalanNode*				theParentNode,
 			XalanNode*				thePreviousSibling,
 			XalanNode*				theNextSibling,

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp Sat Jul 12 23:16:42 2008
@@ -76,7 +76,6 @@
 {
 public:
 
-	typedef XalanSourceTreeElementA::AttributesCountType	AttributesCountType;
 	typedef XalanArrayAllocator<XalanSourceTreeAttr*>		AttributesArrayAllocatorType;
 
 	typedef XalanMap<
@@ -220,43 +219,6 @@
 	virtual XalanDocument*
 	getOwnerDocument() const;
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanSourceTreeDocument*
-#endif
-	cloneNode(bool deep) const;
-
-	virtual XalanNode*
-	insertBefore(
-			XalanNode*	newChild,
-			XalanNode*	refChild);
-
-	virtual XalanNode*
-	replaceChild(
-			XalanNode*	newChild,
-			XalanNode*	oldChild);
-
-	virtual XalanNode*
-	removeChild(XalanNode*	oldChild);
-
-	virtual XalanNode*
-	appendChild(XalanNode*	newChild);
-
-	virtual bool
-	hasChildNodes() const;
-
-	virtual void
-	setNodeValue(const XalanDOMString&		nodeValue);
-
-	virtual void
-	normalize();
-
-	virtual bool
-	isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const;
-
 	virtual const XalanDOMString&
 	getNamespaceURI() const;
 
@@ -266,9 +228,6 @@
 	virtual const XalanDOMString&
 	getLocalName() const;
 
-	virtual void
-	setPrefix(const XalanDOMString& prefix);
-
 	virtual bool
 	isIndexed() const;
 
@@ -276,63 +235,8 @@
 	getIndex() const;
 
 	virtual XalanElement*
-	createElement(const XalanDOMString& tagName);
-
-	virtual XalanDocumentFragment*
-	createDocumentFragment();
-
-	virtual XalanText*
-	createTextNode(const XalanDOMString&	data);
-
-	virtual XalanComment*
-	createComment(const XalanDOMString& data);
-
-	virtual XalanCDATASection*
-	createCDATASection(const XalanDOMString&	data);
-
-	virtual XalanProcessingInstruction*
-	createProcessingInstruction(
-			const XalanDOMString&	target,
-			const XalanDOMString&	data);
-
-	virtual XalanAttr*
-	createAttribute(const XalanDOMString&	name);
-
-	virtual XalanEntityReference*
-	createEntityReference(const XalanDOMString& name);
-
-	virtual XalanDocumentType*
-	getDoctype() const;
-
-	virtual XalanDOMImplementation*
-	getImplementation() const;
-
-	virtual XalanElement*
 	getDocumentElement() const;
 
-	virtual XalanNodeList*
-	getElementsByTagName(const XalanDOMString&		tagname) const;
-
-	virtual XalanNode*
-	importNode(
-			XalanNode*	importedNode,
-			bool		deep);
-
-	virtual XalanElement*
-	createElementNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	qualifiedName);
-
-	virtual XalanAttr*
-	createAttributeNS(
-			const XalanDOMString& namespaceURI,
-			const XalanDOMString& qualifiedName);
-
-	virtual XalanNodeList*
-	getElementsByTagNameNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const;
-
 	virtual XalanElement*
 	getElementById(const XalanDOMString&	elementId) const;
 
@@ -478,7 +382,7 @@
 	createElementNode(
 			const XalanDOMChar*		theTagName,
 			XalanSourceTreeAttr**	theAttributeVector,
-			AttributesCountType		theAttributeCount,
+			XalanSize_t		        theAttributeCount,
 			XalanNode*				theParentNode,
 			XalanNode*				thePreviousSibling,
 			XalanNode*				theNextSibling,

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.cpp Sat Jul 12 23:16:42 2008
@@ -52,7 +52,7 @@
 }
 
 
-
+/*
 XalanSourceTreeDocumentFragment::XalanSourceTreeDocumentFragment(
             MemoryManagerType&                      theManager,
 			const XalanSourceTreeDocumentFragment&	theSource,
@@ -63,7 +63,7 @@
 	m_firstChild(theSource.m_firstChild == 0 ? 0 : theSource.m_firstChild->cloneNode(deep))
 {
 }
-
+*/
 
 
 XalanSourceTreeDocumentFragment::~XalanSourceTreeDocumentFragment()
@@ -167,103 +167,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeDocumentFragment*
-#endif
-XalanSourceTreeDocumentFragment::cloneNode(bool		/* deep */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocumentFragment::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocumentFragment::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocumentFragment::removeChild(XalanNode*		/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeDocumentFragment::appendChild(XalanNode*		/* newChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-bool
-XalanSourceTreeDocumentFragment::hasChildNodes() const
-{
-	return m_firstChild != 0 ? true : false;
-}
-
-
-
-void
-XalanSourceTreeDocumentFragment::setNodeValue(const XalanDOMString&		/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeDocumentFragment::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeDocumentFragment::isSupported(
-			const XalanDOMString&	/* feature */,
-			const XalanDOMString&	/* version */) const
-{
-	return false;
-}
-
-
-
 const XalanDOMString&
 XalanSourceTreeDocumentFragment::getNamespaceURI() const
 {
@@ -288,14 +191,6 @@
 
 
 
-void
-XalanSourceTreeDocumentFragment::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XalanSourceTreeDocumentFragment::isIndexed() const
 {
@@ -350,20 +245,5 @@
 	m_firstChild = 0;
 }
 
-XalanSourceTreeDocumentFragment*
-XalanSourceTreeDocumentFragment::clone(bool	deep) const
-{
-	typedef XalanSourceTreeDocumentFragment Type;
-	
-	XalanMemMgrAutoPtr<Type, false> theGuard( m_manager , (Type*)m_manager.allocate(sizeof(Type)));
-	
-	Type* theResult = theGuard.get();
-	
-	new (theResult) Type(m_manager, *this, deep);
-	
-	theGuard.release();
-	
-	return theResult;
-}
 
 XALAN_CPP_NAMESPACE_END

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocumentFragment.hpp Sat Jul 12 23:16:42 2008
@@ -55,11 +55,12 @@
 	XalanSourceTreeDocumentFragment(MemoryManagerType&  theManager,
                             XalanSourceTreeDocument&	theOwnerDocument);
 
+    /*
 	XalanSourceTreeDocumentFragment(
             MemoryManagerType&                      theManager,
 			const XalanSourceTreeDocumentFragment&	theSource,
 			bool									deep = false);
-
+    */
 	virtual
 	~XalanSourceTreeDocumentFragment();
 
@@ -102,43 +103,6 @@
 #endif
 	getOwnerDocument() const;
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-	virtual XalanNode*
-#else
-	virtual XalanSourceTreeDocumentFragment*
-#endif
-	cloneNode(bool deep) const;
-
-	virtual XalanNode*
-	insertBefore(
-			XalanNode*	newChild,
-			XalanNode*	refChild);
-
-	virtual XalanNode*
-	replaceChild(
-			XalanNode*	newChild,
-			XalanNode*	oldChild);
-
-	virtual XalanNode*
-	removeChild(XalanNode*	oldChild);
-
-	virtual XalanNode*
-	appendChild(XalanNode*	newChild);
-
-	virtual bool
-	hasChildNodes() const;
-
-	virtual void
-	setNodeValue(const XalanDOMString&	nodeValue);
-
-	virtual void
-	normalize();
-
-	virtual bool
-	isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const;
-
 	virtual const XalanDOMString&
 	getNamespaceURI() const;
 
@@ -148,9 +112,6 @@
 	virtual const XalanDOMString&
 	getLocalName() const;
 
-	virtual void
-	setPrefix(const XalanDOMString&		prefix);
-
 	virtual bool
 	isIndexed() const;
 
@@ -174,10 +135,6 @@
 	void
 	clearChildren();
 
-	XalanSourceTreeDocumentFragment*
-	clone(bool	deep) const;
-
-
 protected:
 
 	XalanSourceTreeDocumentFragment&

Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.cpp Sat Jul 12 23:16:42 2008
@@ -46,7 +46,7 @@
 
 
 XalanSourceTreeElement::XalanSourceTreeElement(
-            MemoryManagerType&          theManager,
+            MemoryManager&              theManager,
 			const XalanDOMString&		theTagName,
 			XalanSourceTreeDocument*	theOwnerDocument,
 			XalanNode*					theParentNode,
@@ -72,7 +72,7 @@
 }
 
 
-
+/*
 XalanSourceTreeElement::XalanSourceTreeElement(
             MemoryManagerType&              theManager,
 			const XalanSourceTreeElement&	theSource,
@@ -88,7 +88,7 @@
 	m_index(0)
 {
 }
-
+*/
 
 
 const XalanDOMString&
@@ -181,96 +181,6 @@
 
 
 
-XalanNode*
-XalanSourceTreeElement::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElement::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElement::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElement::appendChild(XalanNode*	/* newChild */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-bool
-XalanSourceTreeElement::hasChildNodes() const
-{
-	return m_firstChild != 0 ? true : false;
-}
-
-
-
-void
-XalanSourceTreeElement::setNodeValue(const XalanDOMString&		/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeElement::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeElement::isSupported(
-			const XalanDOMString&	/* feature */,
-			const XalanDOMString&	/* version */) const
-{
-	return false;
-}
-
-
-
-void
-XalanSourceTreeElement::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XalanSourceTreeElement::isIndexed() const
 {
@@ -295,102 +205,6 @@
 
 
 
-XalanNodeList*
-XalanSourceTreeElement::getElementsByTagName(const XalanDOMString&	/* name */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-void
-XalanSourceTreeElement::setAttribute(
-			const XalanDOMString&	/* name */,
-			const XalanDOMString&	/* value */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-XalanSourceTreeElement::setAttributeNode(XalanAttr*		/* newAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanAttr*
-XalanSourceTreeElement::removeAttributeNode(XalanAttr*	/* oldAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-void
-XalanSourceTreeElement::removeAttribute(const XalanDOMString&	/* name */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeElement::setAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */,
-			const XalanDOMString&	/* value */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeElement::removeAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-XalanSourceTreeElement::setAttributeNodeNS(XalanAttr*	/* newAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNodeList*
-XalanSourceTreeElement::getElementsByTagNameNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */) const
-{
-	throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
 void
 XalanSourceTreeElement::setParent(XalanSourceTreeDocumentFragment*	theParent)
 {



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message