xml-xalan-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject svn commit: r676264 [10/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/XercesParserLiaison/XercesDOMSupport.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.cpp Sat Jul 12 23:16:42 2008
@@ -19,18 +19,19 @@
 
 
 
-#include <xalanc/XalanDOM/XalanNode.hpp>
-#include <xalanc/XalanDOM/XalanAttr.hpp>
-#include <xalanc/XalanDOM/XalanDocument.hpp>
-#include <xalanc/XalanDOM/XalanElement.hpp>
+#include "xercesc/DOM/DOMDocument.hpp"
+#include "xercesc/DOM/DOMDocumentType.hpp"
+#include "xercesc/DOM/DOMEntity.hpp"
+#include "xercesc/DOM/DOMNamedNodeMap.hpp"
 
 
 
-#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+#include "xalanc/DOMSupport/DOMServices.hpp"
 
 
 
-#include <xalanc/DOMSupport/DOMServices.hpp>
+#include "xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp"
+#include "xalanc/XercesParserLiaison/XercesParserLiaison.hpp"
 
 
 
@@ -38,9 +39,13 @@
 
 
 
-XercesDOMSupport::XercesDOMSupport(MemoryManagerType& theManager) :
+static const XalanDOMString     s_emptyString(XalanMemMgrs::getDummyMemMgr());
+
+
+
+XercesDOMSupport::XercesDOMSupport(XercesParserLiaison&     theLiaison) :
 	DOMSupport(),
-	m_domSupportDefault(theManager)
+    m_liaison(theLiaison)
 {
 }
 
@@ -55,7 +60,6 @@
 void
 XercesDOMSupport::reset()
 {
-	m_domSupportDefault.reset();
 }
 
 
@@ -65,7 +69,68 @@
 			const XalanDOMString&	theName,
 			const XalanDocument&	theDocument) const
 {
-	return m_domSupportDefault.getUnparsedEntityURI(theName, theDocument);
+    const XercesDocumentWrapper* const	theWrapper =
+		m_liaison.mapDocumentToWrapper(&theDocument);
+
+    if (theWrapper != 0)
+	{
+        XALAN_USING_XERCES(DOMDocument)
+        XALAN_USING_XERCES(DOMDocumentType)
+        XALAN_USING_XERCES(DOMEntity)
+        XALAN_USING_XERCES(DOMNamedNodeMap)
+        XALAN_USING_XERCES(DOMNode)
+
+        const DOMDocument* const    theDOMDocument =
+            theWrapper->getXercesDocument();
+        assert(theDOMDocument != 0);
+
+        const DOMDocumentType* const	theDoctype =
+		    theDOMDocument->getDoctype();
+
+	    if  (theDoctype != 0)
+	    {
+		    const DOMNamedNodeMap* const	theEntities =
+			    theDoctype->getEntities();
+
+		    if (theEntities != 0)
+		    {
+			    const DOMNode* const	theNode =
+				    theEntities->getNamedItem(theName.c_str());
+
+			    if (theNode != 0 && theNode->getNodeType() == DOMNode::ENTITY_NODE)
+			    {
+				    const DOMEntity* const    theEntity =
+					    static_cast<const DOMEntity*>(theNode);
+
+				    if(length(theEntity->getNotationName()) != 0) // then it's unparsed
+				    {
+					    // The draft says: "The XSLT processor may use the public
+					    // identifier to generate a URI for the entity instead of the URI
+					    // specified in the system identifier. If the XSLT processor does
+					    // not use the public identifier to generate the URI, it must use
+					    // the system identifier; if the system identifier is a relative
+					    // URI, it must be resolved into an absolute URI using the URI of
+					    // the resource containing the entity declaration as the base
+					    // URI [RFC2396]."
+					    // So I'm falling a bit short here.
+					    const XMLCh* theURI = theEntity->getSystemId();
+
+                        if(theURI == 0)
+					    {
+						    theURI = theEntity->getPublicId();
+					    }
+
+                        if(theURI != 0)
+					    {
+                            return theWrapper->getPooledString(theURI);
+					    }
+				    }
+			    }
+		    }
+	    }
+	}
+
+    return s_emptyString;
 }
 
 

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDOMSupport.hpp Sat Jul 12 23:16:42 2008
@@ -26,7 +26,6 @@
 
 
 #include <xalanc/DOMSupport/DOMSupport.hpp>
-#include <xalanc/DOMSupport/DOMSupportDefault.hpp>
 
 
 
@@ -34,11 +33,15 @@
 
 
 
+class XercesParserLiaison;
+
+
+
 class XALAN_XERCESPARSERLIAISON_EXPORT XercesDOMSupport : public DOMSupport
 {
 public:
 
-	XercesDOMSupport(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRUCTOR_MEMMGR);
+	XercesDOMSupport(XercesParserLiaison&   theLiaison);
 
 	virtual
 	~XercesDOMSupport();
@@ -62,7 +65,7 @@
 
 private:
 
-	DOMSupportDefault	m_domSupportDefault;
+    XercesParserLiaison&    m_liaison;
 };
 
 

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.cpp Sat Jul 12 23:16:42 2008
@@ -164,98 +164,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XercesDocumentTypeWrapper*
-#endif
-XercesDocumentTypeWrapper::cloneNode(bool	/* deep */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentTypeWrapper::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentTypeWrapper::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentTypeWrapper::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentTypeWrapper::appendChild(XalanNode*	 /* newChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-bool
-XercesDocumentTypeWrapper::hasChildNodes() const
-{
-	return false;
-}
-
-
-
-void
-XercesDocumentTypeWrapper::setNodeValue(const XalanDOMString&	/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesDocumentTypeWrapper::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XercesDocumentTypeWrapper::isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const
-{
-	return XercesWrapperHelper::isSupported(m_xercesNode, feature, version);
-}
-
-
-
 const XalanDOMString&
 XercesDocumentTypeWrapper::getNamespaceURI() const
 {
@@ -280,14 +188,6 @@
 
 
 
-void
-XercesDocumentTypeWrapper::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XercesDocumentTypeWrapper::isIndexed() const
 {

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentTypeWrapper.hpp Sat Jul 12 23:16:42 2008
@@ -59,396 +59,71 @@
 	~XercesDocumentTypeWrapper();
 
 
-	// These interfaces are inherited from XalanNode...
+	// These interfaces are inherited from XalanDocumentType...
 
 	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> DOMNode
-	 * 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>DOMDocument</code> object associated with this node.
-	 *
-	 * This is also
-	 * the <code>DOMDocument</code> object used to create new nodes. When this
-	 * node is a <code>DOMDocument</code> or a <code>DOMDocumentType</code>
-	 * which is not used with any <code>DOMDocument</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 XercesDocumentTypeWrapper*
-#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>DOMNode</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>DOMDocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DOMDocumentFragment</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>DOMText</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>DOMNode</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>DOMText</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>DOMText</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>DOMCDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>DOMText</CODE>
-	 * nodes and <CODE>DOMCDATASection</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>DOMDocument</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>DOMElement</CODE> and <CODE>DOMAttr</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 XalanDocumentType...
-
-    /** @name Getter functions. */
-    //@{
-
-	/**
-	 * The name of DTD; i.e., the name immediately following the 
-	 * <code>DOCTYPE</code> keyword in an XML source document.
-	 */
 	virtual const XalanDOMString&
 	getName() const;
 
-	/**
-	 * This function returns a  <code>NamedNodeMap</code> containing the general entities, both 
-	 * external and internal, declared in the DTD. Parameter entities are not contained.
-	 * Duplicates are discarded. 
-	 */
 	virtual const XalanNamedNodeMap*
 	getEntities() const;
 
-	/**
-	 * This function returns a named node map containing an entry for
-	 * each notation declared in a document's DTD.  Duplicates are discarded.
-	 */
 	virtual const XalanNamedNodeMap*
 	getNotations() const;
-  //@}
 
-    /** @name Functions introduced in DOM Level 2. */
-    //@{
-    /**
-     * Get the public identifier of the external subset.
-     * @return The public identifier of the external subset.
-     */
-	virtual const XalanDOMString&
+    virtual const XalanDOMString&
 	getPublicId() const;
 
-    /**
-     * Get the system identifier of the external subset.
-     * @return The system identifier of the external subset.
-     */
 	virtual const XalanDOMString&
 	getSystemId() const;
 
-    /**
-     * Get the internal subset as a string.
-     * @return The internal subset as a string.
-     */
 	virtual const XalanDOMString&
 	getInternalSubset() const;
 

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.cpp Sat Jul 12 23:16:42 2008
@@ -1115,97 +1115,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XercesDocumentWrapper*
-#endif
-XercesDocumentWrapper::cloneNode(bool	/* deep */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentWrapper::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentWrapper::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentWrapper::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentWrapper::appendChild(XalanNode*	/* newChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-bool
-XercesDocumentWrapper::hasChildNodes() const
-{
-	return m_xercesDocument->hasChildNodes();
-}
-
-
-
-void
-XercesDocumentWrapper::setNodeValue(const XalanDOMString&	/* nodeValue */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesDocumentWrapper::normalize()
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-bool
-XercesDocumentWrapper::isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const
-{
-	return XercesWrapperHelper::isSupported(m_xercesDocument, feature, version);
-}
-
-
-
 const XalanDOMString&
 XercesDocumentWrapper::getNamespaceURI() const
 {
@@ -1236,14 +1145,6 @@
 
 
 
-void
-XercesDocumentWrapper::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XercesDocumentWrapper::isIndexed() const
 {
@@ -1264,105 +1165,6 @@
 
 
 XalanElement*
-XercesDocumentWrapper::createElement(const XalanDOMString&	/* tagName */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanDocumentFragment*
-XercesDocumentWrapper::createDocumentFragment()
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanText*
-XercesDocumentWrapper::createTextNode(const XalanDOMString&	/* data */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanComment*
-XercesDocumentWrapper::createComment(const XalanDOMString&	/* data */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanCDATASection*
-XercesDocumentWrapper::createCDATASection(const XalanDOMString&		/* data */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanProcessingInstruction*
-XercesDocumentWrapper::createProcessingInstruction(
-			const XalanDOMString&	/* target */,
-			const XalanDOMString&	/* data */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanAttr*
-XercesDocumentWrapper::createAttribute(const XalanDOMString&	/* name */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanEntityReference*
-XercesDocumentWrapper::createEntityReference(const XalanDOMString&	/* name */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanDocumentType*
-XercesDocumentWrapper::getDoctype() const
-{
-	return m_doctype;
-}
-
-
-
-
-XalanDOMImplementation*
-XercesDocumentWrapper::getImplementation() const
-{
-	return m_domImplementation.get();
-}
-
-
-
-XalanElement*
 XercesDocumentWrapper::getDocumentElement() const
 {
 	// If we're working in mapping mode, m_documentElement will
@@ -1372,72 +1174,6 @@
 
 
 
-XalanNodeList*
-XercesDocumentWrapper::getElementsByTagName(const XalanDOMString&	/* tagname */) const
-{
-	// Not supported...
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNode*
-XercesDocumentWrapper::importNode(
-			XalanNode*	/* importedNode */,
-			bool		/* deep */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NO_MODIFICATION_ALLOWED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanElement*
-XercesDocumentWrapper::createElementNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */)
-{
-	// Not supported...
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanAttr*
-XercesDocumentWrapper::createAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */)
-{
-	// Not supported...
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
-XalanNodeList*
-XercesDocumentWrapper::getElementsByTagNameNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	// Dummy return value...
-	return 0;
-}
-
-
-
 XalanElement*
 XercesDocumentWrapper::getElementById(const XalanDOMString&		elementId) const
 {

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesDocumentWrapper.hpp Sat Jul 12 23:16:42 2008
@@ -156,43 +156,6 @@
     virtual XalanDocument*
     getOwnerDocument() const;
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-    virtual XalanNode*
-#else
-    virtual XercesDocumentWrapper*
-#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;
 
@@ -202,9 +165,6 @@
     virtual const XalanDOMString&
     getLocalName() const;
 
-    virtual void
-    setPrefix(const XalanDOMString& prefix);
-
     virtual bool
     isIndexed() const;
 
@@ -212,63 +172,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;
 
@@ -450,7 +355,7 @@
     const XalanDOMString&
     getPooledString(
             const XalanDOMChar*         theString,
-            XalanDOMString::size_type   theLength /* = XalanDOMString::npos */) const;
+            XalanDOMString::size_type   theLength = XalanDOMString::npos) const;
 
     bool
     getMappingMode() const

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.cpp Sat Jul 12 23:16:42 2008
@@ -34,7 +34,6 @@
 
 #include "XercesWrapperHelper.hpp"
 #include "XercesWrapperNavigator.hpp"
-#include "XercesDOMWrapperException.hpp"
 #include "XercesDocumentWrapper.hpp"
 
 
@@ -151,98 +150,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XercesElementWrapper*
-#endif
-XercesElementWrapper::cloneNode(bool	/* deep */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesElementWrapper::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesElementWrapper::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesElementWrapper::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesElementWrapper::appendChild(XalanNode*	/* newChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-bool
-XercesElementWrapper::hasChildNodes() const
-{
-	return m_xercesNode->hasChildNodes();
-}
-
-
-
-void
-XercesElementWrapper::setNodeValue(const XalanDOMString&	/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesElementWrapper::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XercesElementWrapper::isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const
-{
-	return XercesWrapperHelper::isSupported(m_xercesNode, feature, version);
-}
-
-
-
 const XalanDOMString&
 XercesElementWrapper::getNamespaceURI() const
 {
@@ -267,14 +174,6 @@
 
 
 
-void
-XercesElementWrapper::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XercesElementWrapper::isIndexed() const
 {
@@ -299,149 +198,8 @@
 
 
 
-const XalanDOMString&
-XercesElementWrapper::getAttribute(const XalanDOMString&	name) const
-{
-	return m_navigator.getPooledString(m_xercesNode->getAttribute(c_wstr(name)));
-}
-
-
-
-XalanAttr*
-XercesElementWrapper::getAttributeNode(const XalanDOMString&	name) const
-{
-#if defined(XALAN_OLD_STYLE_CASTS)
-	return (XalanAttr*)m_attributes.getNamedItem(name);
-#else
-	return static_cast<XalanAttr*>(m_attributes.getNamedItem(name));
-#endif
-}
-
-
-
-XalanNodeList*
-XercesElementWrapper::getElementsByTagName(const XalanDOMString&	/* name */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-void
-XercesElementWrapper::setAttribute(
-			const XalanDOMString&	/* name */,
-			const XalanDOMString&	/* value */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-XercesElementWrapper::setAttributeNode(XalanAttr*	/* newAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-XalanAttr*
-XercesElementWrapper::removeAttributeNode(XalanAttr*	/* oldAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-void
-XercesElementWrapper::removeAttribute(const XalanDOMString&		/* name */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-const XalanDOMString&
-XercesElementWrapper::getAttributeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const
-{
-	return m_navigator.getPooledString(m_xercesNode->getAttributeNS(c_wstr(namespaceURI), c_wstr(localName)));
-}
-
-
-
-void
-XercesElementWrapper::setAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* qualifiedName */,
-			const XalanDOMString&	/* value */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesElementWrapper::removeAttributeNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanAttr*
-XercesElementWrapper::getAttributeNodeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const
-{
-	DOMAttrType* const	theAttrNode =
-		m_xercesNode->getAttributeNodeNS(c_wstr(namespaceURI), c_wstr(localName));
-
-	if (theAttrNode == 0)
-	{
-		return 0;
-	}
-	else
-	{
-		return m_navigator.mapNode(theAttrNode);
-	}
-}
-
-
-
-XalanAttr*
-XercesElementWrapper::setAttributeNodeNS(XalanAttr*		/* newAttr */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNodeList*
-XercesElementWrapper::getElementsByTagNameNS(
-			const XalanDOMString&	/* namespaceURI */,
-			const XalanDOMString&	/* localName */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
 XalanNode*
-XercesElementWrapper::item(unsigned int		index) const
+XercesElementWrapper::item(XalanSize_t  index) const
 {
 	assert(index < getLength());
 
@@ -456,7 +214,7 @@
 		XalanNode*	child = getFirstChild();
 		assert(child != 0);
 
-		for(unsigned int i = 0; i < index; ++i)
+		for(XalanSize_t i = 0; i < index; ++i)
 		{
 			child = child->getNextSibling();
 			assert(child != 0);
@@ -468,7 +226,7 @@
 
 
 
-unsigned int
+XalanSize_t
 XercesElementWrapper::getLength() const
 {
 	return m_xercesNode->getChildNodes()->getLength();

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesElementWrapper.hpp Sat Jul 12 23:16:42 2008
@@ -58,626 +58,60 @@
 	~XercesElementWrapper();
 
 
-	/**
-	 * Gets the name of this node.
-	 */
+	// These interfaces are inherited from XalanElement...
+
 	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> DOMNode
-	 * 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>DOMDocument</code> object associated with this node.
-	 *
-	 * This is also
-	 * the <code>DOMDocument</code> object used to create new nodes. When this
-	 * node is a <code>DOMDocument</code> or a <code>DOMDocumentType</code>
-	 * which is not used with any <code>DOMDocument</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 XercesElementWrapper*
-#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>DOMNode</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>DOMDocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DOMDocumentFragment</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>DOMText</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>DOMNode</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>DOMText</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>DOMText</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>DOMCDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>DOMText</CODE>
-	 * nodes and <CODE>DOMCDATASection</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>DOMDocument</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>DOMElement</CODE> and <CODE>DOMAttr</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 XalanElement...
-
-	/**
-	 * The name of the element. 
-	 *
-	 * For example, in: &lt;elementExample 
-	 * id="demo"&gt;  ... &lt;/elementExample&gt; , <code>tagName</code> has 
-	 * the value <code>"elementExample"</code>. Note that this is 
-	 * case-preserving in XML, as are all of the operations of the DOM. 
-	 */
 	virtual const XalanDOMString&
 	getTagName() const;
 
 	/**
-	 * Retrieves an attribute value by name.
-	 *
-	 * @param name The name of the attribute to retrieve.
-	 * @return The <code>DOMAttr</code> value as a string, or the empty  string if 
-	 *   that attribute does not have a specified or default value.
-	 */
-	virtual const XalanDOMString&
-	getAttribute(const XalanDOMString&		name) const;
-
-	/**
-	 * Retrieves an <code>DOMAttr</code> node by name.
-	 *
-	 * @param name The name (<CODE>nodeName</CODE>) of the attribute to retrieve.
-	 * @return The <code>DOMAttr</code> node with the specified name (<CODE>nodeName</CODE>) or 
-	 *   <code>null</code> if there is no such attribute.
-	 */
-	virtual XalanAttr*
-	getAttributeNode(const XalanDOMString&		name) const;
-
-	/**
-	 * Returns a <code>NodeList</code> of all descendant elements with a given 
-	 * tag name, in the order in which they would be encountered in a preorder 
-	 * traversal of the <code>DOMElement</code> tree.  Caller is
-	 * responsible for deleting the XalanNodeList instance.
-	 *
-	 * @param name The name of the tag to match on. The special value "*" 
-	 *   matches all tags.
-	 * @return A list of matching <code>DOMElement</code> nodes.
-	 */
-	virtual XalanNodeList*
-	getElementsByTagName(const XalanDOMString&		name) const;
-
-	//@}
-	 /** @name Set functions. */
-	 //@{
-
-	/**
-	 * Adds a new attribute. 
-	 * 
-	 * If an attribute with that name is already present 
-	 * in the element, its value is changed to be that of the value parameter. 
-	 * This value is a simple string, it is not parsed as it is being set. So 
-	 * any markup (such as syntax to be recognized as an entity reference) is 
-	 * treated as literal text, and needs to be appropriately escaped by the 
-	 * implementation when it is written out. In order to assign an attribute 
-	 * value that contains entity references, the user must create an 
-	 * <code>DOMAttr</code> node plus any <code>Text</code> and 
-	 * <code>EntityReference</code> nodes, build the appropriate subtree, and 
-	 * use <code>setAttributeNode</code> to assign it as the value of an 
-	 * attribute.
-	 * @param name The name of the attribute to create or alter.
-	 * @param value Value to set in string form.
-	 * @exception DOMException
-	 *   INVALID_CHARACTER_ERR: Raised if the specified name contains an 
-	 *   illegal character.
-	 *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	setAttribute(
-			const XalanDOMString&	name, 
-			const XalanDOMString&	value);
-
-	/**
-	 * Adds a new attribute. 
-	 * 
-	 * If an attribute with that name (<CODE>nodeName</CODE>) is already present 
-	 * in the element, it is replaced by the new one.
-	 * @param newAttr The <code>DOMAttr</code> node to add to the attribute list.
-	 * @return If the <code>newAttr</code> attribute replaces an existing 
-     *   attribute, the replaced
-     *   <code>DOMAttr</code> node is returned, otherwise <code>null</code> is 
-     *   returned.
-     * @exception DOMException
-     *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a 
-     *   different document than the one that created the element.
-     *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an 
-     *   attribute of another <code>DOMElement</code> object. The DOM user must 
-     *   explicitly clone <code>DOMAttr</code> nodes to re-use them in other 
-     *   elements.
-     */
-	virtual XalanAttr*
-	setAttributeNode(XalanAttr*		newAttr);
-
-    //@}
-    /** @name Functions which modify the Element. */
-    //@{
-    
-	/**
-	 * Removes the specified attribute node.
-	 * If the removed <CODE>DOMAttr</CODE>
-	 *   has a default value it is immediately replaced. The replacing attribute 
-	 *   has the same namespace URI and local name, as well as the original prefix, 
-	 *   when applicable.
-	 *
-	 * @param oldAttr The <code>DOMAttr</code> node to remove from the attribute 
-	 *   list.
-	 * @return The <code>DOMAttr</code> node that was removed.
-	 * @exception DOMException
-	 *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 *   <br>NOT_FOUND_ERR: Raised if <code>oldAttr</code> is not an attribute 
-	 *   of the element.
-	 */
-	virtual XalanAttr*
-	removeAttributeNode(XalanAttr*	oldAttr);
-
-	/**
-	 * Removes an attribute by name. 
-	 *
-	 * If the removed attribute 
-	 *   is known to have a default value, an attribute immediately appears 
-	 *   containing the default value as well as the corresponding namespace URI, 
-	 *   local name, and prefix when applicable.<BR>To remove an attribute by local 
-	 *   name and namespace URI, use the <CODE>removeAttributeNS</CODE> method.
-	 * @param name The name of the attribute to remove.
-	 * @exception DOMException
-	 *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	removeAttribute(const XalanDOMString&	name);
-
-	//@}
-	/** @name Functions introduced in DOM Level 2. */
-	//@{
-
-	/**
-	 * Retrieves an attribute value by local name and namespace URI.
-	 *
-	 * @param namespaceURI The <em>namespace URI</em> of
-	 *    the attribute to retrieve.
-	 * @param localName The <em>local name</em> of the
-	 *    attribute to retrieve.
-	 * @return The <code>DOMAttr</code> value as a string, or an empty string if
-	*    that attribute does not have a specified or default value.
-	 */
-	virtual const XalanDOMString&
-	getAttributeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const;
-
-	/**
-	 * Adds a new attribute. If the given 
-	 *   <CODE>namespaceURI</CODE> is <CODE>null</CODE> or an empty string and the 
-	 *   <CODE>qualifiedName</CODE> has a prefix that is "xml", the new attribute 
-	 *   is bound to the predefined namespace 
-	 *   "http://www.w3.org/XML/1998/namespace". 
-	 *   If an attribute with the same local name and namespace URI is already 
-	 *   present on the element, its prefix is changed to be the prefix part of the 
-	 *   <CODE>qualifiedName</CODE>, and its value is changed to be the 
-	 *   <CODE>value</CODE> parameter. 
-	 * This value is a simple string, it is
-	 * not parsed as it is being set. So any markup (such as syntax to be
-	 * recognized as an entity reference) is treated as literal text, and
-	 * needs to be appropriately escaped by the implementation when it is
-	 * written out. In order to assign an attribute value that contains entity
-	 * references, the user must create a <code>DOMAttr</code> node plus any
-	 * <code>DOMText</code> and <code>DOMEntityReference</code> nodes, build the
-	 * appropriate subtree, and use <code>setAttributeNodeNS</code> or
-	 * <code>setAttributeNode</code> to assign it as the value of an
-	 * attribute.
-	 * @param namespaceURI The <em>namespace URI</em> of
-	 *    the attribute to create or alter.
-	 * @param localName The <em>local name</em> of the
-	 *    attribute to create or alter.
-	 * @param value The value to set in string form.
-	 * @exception DOMException
-	 *   INVALID_CHARACTER_ERR: Raised if the specified qualified name contains an 
-	 *   illegal character.
-	 *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 * <br>
-	 *   NAMESPACE_ERR: Raised if the <CODE>qualifiedName</CODE> is 
-	 *         malformed, if the <CODE>qualifiedName</CODE> has a prefix that is 
-	 *         "xml" and the <CODE>namespaceURI</CODE> is neither <CODE>null</CODE> 
-	 *         nor an empty string nor "http://www.w3.org/XML/1998/namespace", or 
-	 *         if the <CODE>qualifiedName</CODE> has a prefix that is "xmlns" but 
-	 *         the <CODE>namespaceURI</CODE> is neither <CODE>null</CODE> nor an 
-	 *         empty string, or if if the <CODE>qualifiedName</CODE> has a prefix 
-	 *         different from "xml" and "xmlns" and the <CODE>namespaceURI</CODE> 
-	 *         is <CODE>null</CODE> or an empty string.
-	 */
-	virtual void
-	setAttributeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	qualifiedName,
-			const XalanDOMString&	value);
-
-	/**
-	 * Removes an attribute by local name and namespace URI. If the
-	 * removed attribute has a default value it is immediately replaced.
-	 * The replacing attribute has the same namespace URI and local name, as well as 
-	 * the original prefix.<BR>HTML-only DOM implementations do not need to 
-	 * implement this method.
-	 *
-	 * @param namespaceURI The <em>namespace URI</em> of
-	 *    the attribute to remove.
-	 * @param localName The <em>local name</em> of the
-	 *    attribute to remove.
-	 * @exception DOMException
-	 *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	 */
-	virtual void
-	removeAttributeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName);
-
-	/**
-	 * Retrieves an <code>DOMAttr</code> node by local name and namespace URI.
-	 *
-	 * @param namespaceURI The <em>namespace URI</em> of
-	 *    the attribute to retrieve.
-	 * @param localName The <em>local name</em> of the
-	 *    attribute to retrieve.
-	 * @return The <code>DOMAttr</code> node with the specified attribute local
-	 *    name and namespace URI or <code>null</code> if there is no such attribute.
-	 */
-	virtual XalanAttr*
-	getAttributeNodeNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const;
-
-	/**
-	  * Adds a new attribute. 
-	  * 
-	  * If an attribute with that local name and namespace URI is already present 
-	  * in the element, it is replaced by the new one.
-	  * @param newAttr The <code>DOMAttr</code> node to add to the attribute list.
-	  * @return If the <code>newAttr</code> attribute replaces an existing
-	  *    attribute with the same <em>local name</em> and <em>namespace URI</em>,
-	  *    the replaced <code>DOMAttr</code> node is
-	  *    returned, otherwise <code>null</code> is returned.
-	  * @exception DOMException
-	  *   WRONG_DOCUMENT_ERR: Raised if <code>newAttr</code> was created from a 
-	  *   different document than the one that created the element.
-	  *   <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-	  *   <br>INUSE_ATTRIBUTE_ERR: Raised if <code>newAttr</code> is already an 
-	  *   attribute of another <code>DOMElement</code> object. The DOM user must 
-	  *   explicitly clone <code>DOMAttr</code> nodes to re-use them in other 
-	  *   elements.
-	  */
-	virtual XalanAttr*
-	setAttributeNodeNS(XalanAttr*	newAttr);
-
-	/**
-	 * Returns a <code>DOMNodeList</code> of all the <code>DOMElement</code>s
-	 * with a given local name and namespace URI in the order in which they
-	 * would be encountered in a preorder traversal of the
-	 * <code>DOMDocument</code> tree, starting from this node.  Caller is
-	 * responsible for deleting the XalanNodeList instance.
-	 *
-	 * @param namespaceURI The <em>namespace URI</em> of
-	 *    the elements to match on. The special value "*" matches all
-	 *    namespaces.
-	 * @param localName The <em>local name</em> of the
-	 *    elements to match on. The special value "*" matches all local names.
-	 * @return A new <code>DOMNodeList</code> object containing all the matched
-	 *    <code>Element</code>s.
-	 */
-	virtual XalanNodeList*
-	getElementsByTagNameNS(
-			const XalanDOMString&	namespaceURI,
-			const XalanDOMString&	localName) const;
-
-	/**
 	 * Get the Xerces node this instance represent.
 	 *
 	 * @return The Xerces node
@@ -694,9 +128,9 @@
 
 	// Implementation of XalanNodeList for children.
 	virtual XalanNode*
-	item(unsigned int	index) const;
+	item(XalanSize_t	index) const;
 
-	virtual unsigned int
+	virtual XalanSize_t
 	getLength() const;
 
 

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.cpp Sat Jul 12 23:16:42 2008
@@ -164,98 +164,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XercesEntityReferenceWrapper*
-#endif
-XercesEntityReferenceWrapper::cloneNode(bool		/* deep */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityReferenceWrapper::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityReferenceWrapper::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityReferenceWrapper::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityReferenceWrapper::appendChild(XalanNode*	/* newChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-bool
-XercesEntityReferenceWrapper::hasChildNodes() const
-{
-	return m_xercesNode->hasChildNodes();
-}
-
-
-
-void
-XercesEntityReferenceWrapper::setNodeValue(const XalanDOMString&	/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesEntityReferenceWrapper::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XercesEntityReferenceWrapper::isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const
-{
-	return XercesWrapperHelper::isSupported(m_xercesNode, feature, version);
-}
-
-
-
 const XalanDOMString&
 XercesEntityReferenceWrapper::getNamespaceURI() const
 {
@@ -280,14 +188,6 @@
 
 
 
-void
-XercesEntityReferenceWrapper::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XercesEntityReferenceWrapper::isIndexed() const
 {

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.hpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityReferenceWrapper.hpp Sat Jul 12 23:16:42 2008
@@ -60,340 +60,50 @@
 	~XercesEntityReferenceWrapper();
 
 
-	// These interfaces are inherited from XalanNode...
+	// These interfaces are inherited from XalanEntityReference...
 
 	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> DOMNode
-	 * 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>DOMDocument</code> object associated with this node.
-	 *
-	 * This is also
-	 * the <code>DOMDocument</code> object used to create new nodes. When this
-	 * node is a <code>DOMDocument</code> or a <code>DOMDocumentType</code>
-	 * which is not used with any <code>DOMDocument</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 XercesEntityReferenceWrapper*
-#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>DOMNode</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>DOMDocumentFragment</CODE> object,
-	 * <CODE>oldChild</CODE> is replaced by all of the <CODE>DOMDocumentFragment</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>DOMText</CODE>
-	 * nodes in the full depth of the sub-tree underneath this <CODE>DOMNode</CODE>, 
-	 * including attribute nodes, into a "normal" form where only markup (e.g., 
-	 * tags, comments, processing instructions, CDATA sections, and entity 
-	 * references) separates <CODE>DOMText</CODE>
-	 * nodes, i.e., there are no adjacent <CODE>DOMText</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>DOMCDATASections</CODE>, 
-	 * the normalize operation alone may not be sufficient, since XPointers do 
-	 * not differentiate between <CODE>DOMText</CODE>
-	 * nodes and <CODE>DOMCDATASection</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>DOMDocument</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>DOMElement</CODE> and <CODE>DOMAttr</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;
 

Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/XercesEntityWrapper.cpp Sat Jul 12 23:16:42 2008
@@ -163,98 +163,6 @@
 
 
 
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XercesEntityWrapper*
-#endif
-XercesEntityWrapper::cloneNode(bool		/* deep */) const
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::NOT_SUPPORTED_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityWrapper::insertBefore(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* refChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityWrapper::replaceChild(
-			XalanNode*	/* newChild */,
-			XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityWrapper::removeChild(XalanNode*	/* oldChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-XalanNode*
-XercesEntityWrapper::appendChild(XalanNode*	/* newChild */)
-{
-	throw XercesDOMWrapperException(XercesDOMWrapperException::HIERARCHY_REQUEST_ERR);
-
-	return 0;
-}
-
-
-
-bool
-XercesEntityWrapper::hasChildNodes() const
-{
-	return m_xercesNode->hasChildNodes();
-}
-
-
-
-void
-XercesEntityWrapper::setNodeValue(const XalanDOMString&	/* nodeValue */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XercesEntityWrapper::normalize()
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XercesEntityWrapper::isSupported(
-			const XalanDOMString&	feature,
-			const XalanDOMString&	version) const
-{
-	return XercesWrapperHelper::isSupported(m_xercesNode, feature, version);
-}
-
-
-
 const XalanDOMString&
 XercesEntityWrapper::getNamespaceURI() const
 {
@@ -279,14 +187,6 @@
 
 
 
-void
-XercesEntityWrapper::setPrefix(const XalanDOMString&	/* prefix */)
-{
-	throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
 bool
 XercesEntityWrapper::isIndexed() const
 {



---------------------------------------------------------------------
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