You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/07/13 08:16:50 UTC
svn commit: r676264 [8/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/...
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElement.hpp Sat Jul 12 23:16:42 2008
@@ -60,7 +60,7 @@
* @param theIndex The document-order index of the node.
*/
XalanSourceTreeElement(
- MemoryManagerType& theManager,
+ MemoryManager& theManager,
const XalanDOMString& theTagName,
XalanSourceTreeDocument* theOwnerDocument,
XalanNode* theParentNode = 0,
@@ -71,633 +71,65 @@
virtual
~XalanSourceTreeElement();
- MemoryManagerType&
+ MemoryManager&
getMemoryManager()
{
return m_memoryManager;
}
- /**
- * 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> 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 = 0;
- /**
- * 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 XalanSourceTreeElement*
-#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>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 = 0;
- /**
- * Get the <em>namespace prefix</em>
- * of this node, or <code>null</code> if it is unspecified.
- */
virtual const XalanDOMString&
getPrefix() const = 0;
- /**
- * 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 = 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>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 XalanElement...
-
- /**
- * The name of the element.
- *
- * For example, in: <elementExample
- * id="demo"> ... </elementExample> , <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>DOM_Attr</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 = 0;
-
- /**
- * Retrieves an <code>DOM_Attr</code> node by name.
- *
- * @param name The name (<CODE>nodeName</CODE>) of the attribute to retrieve.
- * @return The <code>DOM_Attr</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 = 0;
-
- /**
- * 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>DOM_Element</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>DOM_Element</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>DOM_Attr</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>DOM_Attr</code> node to add to the attribute list.
- * @return If the <code>newAttr</code> attribute replaces an existing
- * attribute, the replaced
- * <code>DOM_Attr</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>DOM_Element</code> object. The DOM user must
- * explicitly clone <code>DOM_Attr</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>DOM_Attr</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>DOM_Attr</code> node to remove from the attribute
- * list.
- * @return The <code>DOM_Attr</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>DOM_Attr</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 = 0;
-
- /**
- * 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>DOM_Attr</code> node plus any
- * <code>DOM_Text</code> and <code>DOM_EntityReference</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>DOM_Attr</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>DOM_Attr</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 = 0;
-
- /**
- * 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>DOM_Attr</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>DOM_Attr</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>DOM_Element</code> object. The DOM user must
- * explicitly clone <code>DOM_Attr</code> nodes to re-use them in other
- * elements.
- */
- virtual XalanAttr*
- setAttributeNodeNS(XalanAttr* newAttr);
-
- /**
- * Returns a <code>DOM_NodeList</code> of all the <code>DOM_Element</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>DOM_Document</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>DOM_NodeList</code> object containing all the matched
- * <code>Element</code>s.
- */
- virtual XalanNodeList*
- getElementsByTagNameNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
- //@}
-
-
// public interfaces not inherited from XalanElement...
XalanSourceTreeDocument*
@@ -770,11 +202,12 @@
protected:
+ /*
XalanSourceTreeElement(
MemoryManagerType& theManager,
const XalanSourceTreeElement& theSource,
bool deep = false);
-
+ */
static const XalanDOMString s_emptyString;
// Data members...
@@ -783,7 +216,9 @@
private:
// Not implemented...
- XalanSourceTreeElement&
+ XalanSourceTreeElement(const XalanSourceTreeElement& theSource);
+
+ XalanSourceTreeElement&
operator=(const XalanSourceTreeElement& theSource);
bool
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.cpp Sat Jul 12 23:16:42 2008
@@ -42,7 +42,7 @@
const XalanDOMString& theTagName,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode,
XalanNode* thePreviousSibling,
XalanNode* theNextSibling,
@@ -67,39 +67,6 @@
}
-
-XalanSourceTreeElementA::XalanSourceTreeElementA(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep) :
- XalanSourceTreeElement(theManager, theSource, deep),
- m_attributes(theSource.m_attributes),
- m_attributeCount(theSource.m_attributeCount)
-{
-}
-
-XalanSourceTreeElementA*
-XalanSourceTreeElementA::create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep )
-{
- typedef XalanSourceTreeElementA ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager,
- theSource,
- deep);
-
- theGuard.release();
-
- return theResult;
-}
-
-
const XalanNamedNodeMap*
XalanSourceTreeElementA::getAttributes() const
{
@@ -108,21 +75,6 @@
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeElementA*
-#endif
-XalanSourceTreeElementA::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeElementA::getNamespaceURI() const
{
@@ -147,20 +99,18 @@
-const XalanDOMString&
-XalanSourceTreeElementA::getAttribute(const XalanDOMString& name) const
+XalanNode*
+XalanSourceTreeElementA::item(XalanSize_t index) const
{
- XalanAttr* const theAttr = getAttributeNode(name);
-
- return theAttr == 0 ? s_emptyString : theAttr->getValue();
+ return index < m_attributeCount ? m_attributes[index] : 0;
}
-XalanAttr*
-XalanSourceTreeElementA::getAttributeNode(const XalanDOMString& name) const
+XalanNode*
+XalanSourceTreeElementA::getNamedItem(const XalanDOMString& name) const
{
- for(unsigned int i = 0; i < m_attributeCount; ++i)
+ for (XalanSize_t i = 0; i < m_attributeCount; ++i)
{
assert(m_attributes[i] != 0);
@@ -175,24 +125,20 @@
-const XalanDOMString&
-XalanSourceTreeElementA::getAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const
+XalanSize_t
+XalanSourceTreeElementA::getLength() const
{
- XalanAttr* const theAttr = getAttributeNodeNS(namespaceURI, localName);
-
- return theAttr == 0 ? s_emptyString : theAttr->getValue();
+ return m_attributeCount;
}
-XalanAttr*
-XalanSourceTreeElementA::getAttributeNodeNS(
+XalanNode*
+XalanSourceTreeElementA::getNamedItemNS(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
- for(unsigned int i = 0; i < m_attributeCount; ++i)
+ for (XalanSize_t i = 0; i < m_attributeCount; ++i)
{
assert(m_attributes[i] != 0);
@@ -208,84 +154,4 @@
-XalanNode*
-XalanSourceTreeElementA::setNamedItem(XalanNode* /* arg */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::item(unsigned int index) const
-{
- return index < m_attributeCount ? m_attributes[index] : 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::getNamedItem(const XalanDOMString& name) const
-{
- return getAttributeNode(name);
-}
-
-
-
-unsigned int
-XalanSourceTreeElementA::getLength() const
-{
- return m_attributeCount;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::removeNamedItem(const XalanDOMString& /* name */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::getNamedItemNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const
-{
- return getAttributeNodeNS(namespaceURI, localName);
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::setNamedItemNS(XalanNode* /* arg */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeElementA::removeNamedItemNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementA.hpp Sat Jul 12 23:16:42 2008
@@ -40,8 +40,6 @@
{
public:
- typedef unsigned long AttributesCountType;
-
/**
* Constructor.
*
@@ -59,7 +57,7 @@
const XalanDOMString& theTagName,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode = 0,
XalanNode* thePreviousSibling = 0,
XalanNode* theNextSibling = 0,
@@ -72,13 +70,6 @@
virtual const XalanNamedNodeMap*
getAttributes() const;
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XalanNode*
-#else
- virtual XalanSourceTreeElementA*
-#endif
- cloneNode(bool deep) const;
-
virtual const XalanDOMString&
getNamespaceURI() const;
@@ -88,103 +79,54 @@
virtual const XalanDOMString&
getLocalName() const;
- virtual const XalanDOMString&
- getAttribute(const XalanDOMString& name) const;
-
- virtual XalanAttr*
- getAttributeNode(const XalanDOMString& name) const;
- virtual const XalanDOMString&
- getAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
+ // public interfaces not inherited from XalanElement...
- virtual XalanAttr*
- getAttributeNodeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
-
- // public interfaces not inherited from XalanElement...
-
- AttributesCountType
+ XalanSize_t
getAttributeCount() const
{
return m_attributeCount;
}
XalanSourceTreeAttr*
- getAttributeByIndex(AttributesCountType index) const
+ getAttributeByIndex(XalanSize_t index) const
{
return index < m_attributeCount ? m_attributes[index] : 0;
}
- XalanSourceTreeElementA*
- clone(bool deep) const
- {
- MemoryManagerType& theManager = const_cast<XalanSourceTreeElementA*>(this)->getMemoryManager();
-
- return XalanSourceTreeElementA::create(theManager, *this, deep);
- }
-
-protected:
-
- XalanSourceTreeElementA(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep = false);
-
- static XalanSourceTreeElementA*
- create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep = false);
-
private:
// These are from XalanNamedNodeMap...
virtual XalanNode*
- setNamedItem(XalanNode* arg);
-
- virtual XalanNode*
- item(unsigned int index) const;
+ item(XalanSize_t index) const;
virtual XalanNode*
getNamedItem(const XalanDOMString& name) const;
- virtual unsigned int
+ virtual XalanSize_t
getLength() const;
virtual XalanNode*
- removeNamedItem(const XalanDOMString& name);
-
- virtual XalanNode*
getNamedItemNS(
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const;
- virtual XalanNode*
- setNamedItemNS(XalanNode* arg);
-
- virtual XalanNode*
- removeNamedItemNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName);
-
// Not implemented...
+ XalanSourceTreeElementA(const XalanSourceTreeElementA&);
+
XalanSourceTreeElementA&
- operator=(const XalanSourceTreeElementA& theSource);
+ operator=(const XalanSourceTreeElementA&);
bool
- operator==(const XalanSourceTreeElementA& theRHS) const;
+ operator==(const XalanSourceTreeElementA&) const;
// Data members...
XalanSourceTreeAttr* const * m_attributes;
- const AttributesCountType m_attributeCount;
+ const XalanSize_t m_attributeCount;
};
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.cpp Sat Jul 12 23:16:42 2008
@@ -25,7 +25,9 @@
-XalanSourceTreeElementAAllocator::XalanSourceTreeElementAAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanSourceTreeElementAAllocator::XalanSourceTreeElementAAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -43,7 +45,7 @@
const XalanDOMString& theTagName,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode,
XalanNode* thePreviousSibling,
XalanNode* theNextSibling,
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementAAllocator.hpp Sat Jul 12 23:16:42 2008
@@ -45,8 +45,6 @@
typedef ObjectType::IndexType IndexType;
- typedef ObjectType::AttributesCountType AttributesCountType;
-
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<ObjectType> ArenaBlockType;
@@ -63,7 +61,9 @@
*
* @param theBlockSize The block size.
*/
- XalanSourceTreeElementAAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanSourceTreeElementAAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount);
~XalanSourceTreeElementAAllocator();
@@ -86,7 +86,7 @@
const XalanDOMString& theTagName,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode = 0,
XalanNode* thePreviousSibling = 0,
XalanNode* theNextSibling = 0,
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.cpp Sat Jul 12 23:16:42 2008
@@ -24,14 +24,14 @@
XalanSourceTreeElementANS::XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
+ MemoryManager& theManager,
const XalanDOMString& theTagName,
const XalanDOMString& theLocalName,
const XalanDOMString& theNamespaceURI,
const XalanDOMString& thePrefix,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode,
XalanNode* thePreviousSibling,
XalanNode* theNextSibling,
@@ -59,48 +59,6 @@
}
-
-XalanSourceTreeElementANS::XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementANS& theSource,
- bool deep) :
- XalanSourceTreeElementA(theManager, theSource, deep),
- m_localName(theSource.m_localName),
- m_prefix(theSource.m_prefix),
- m_namespaceURI(theSource.m_namespaceURI)
-{
-}
-
-
-
-XalanSourceTreeElementANS::XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep) :
- XalanSourceTreeElementA(theManager, theSource, deep),
- m_localName(theSource.getLocalName()),
- m_prefix(theSource.getPrefix()),
- m_namespaceURI(theSource.getNamespaceURI())
-{
-}
-
-
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeElementANS*
-#endif
-XalanSourceTreeElementANS::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeElementANS::getNamespaceURI() const
{
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANS.hpp Sat Jul 12 23:16:42 2008
@@ -52,14 +52,14 @@
* @param theIndex The document-order index of the node.
*/
XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
+ MemoryManager& theManager,
const XalanDOMString& theTagName,
const XalanDOMString& theLocalName,
const XalanDOMString& theNamespaceURI,
const XalanDOMString& thePrefix,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode = 0,
XalanNode* thePreviousSibling = 0,
XalanNode* theNextSibling = 0,
@@ -69,13 +69,6 @@
~XalanSourceTreeElementANS();
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XalanNode*
-#else
- virtual XalanSourceTreeElementANS*
-#endif
- cloneNode(bool deep) const;
-
virtual const XalanDOMString&
getNamespaceURI() const;
@@ -85,21 +78,11 @@
virtual const XalanDOMString&
getLocalName() const;
-protected:
-
- XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementANS& theSource,
- bool deep);
-
- XalanSourceTreeElementANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementA& theSource,
- bool deep);
-
private:
// Not implemented...
+ XalanSourceTreeElementANS(const XalanSourceTreeElementANS&);
+
XalanSourceTreeElementANS&
operator=(const XalanSourceTreeElementANS& theSource);
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.cpp Sat Jul 12 23:16:42 2008
@@ -25,7 +25,9 @@
-XalanSourceTreeElementANSAllocator::XalanSourceTreeElementANSAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanSourceTreeElementANSAllocator::XalanSourceTreeElementANSAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
@@ -46,7 +48,7 @@
const XalanDOMString& thePrefix,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode,
XalanNode* thePreviousSibling,
XalanNode* theNextSibling,
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementANSAllocator.hpp Sat Jul 12 23:16:42 2008
@@ -45,8 +45,6 @@
typedef ObjectType::IndexType IndexType;
- typedef ObjectType::AttributesCountType AttributesCountType;
-
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<ObjectType> ArenaBlockType;
@@ -63,7 +61,9 @@
*
* @param theBlockSize The block size.
*/
- XalanSourceTreeElementANSAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanSourceTreeElementANSAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount);
~XalanSourceTreeElementANSAllocator();
@@ -92,7 +92,7 @@
const XalanDOMString& thePrefix,
XalanSourceTreeDocument* theOwnerDocument,
XalanSourceTreeAttr** theAttributes,
- AttributesCountType theAttributeCount,
+ XalanSize_t theAttributeCount,
XalanNode* theParentNode = 0,
XalanNode* thePreviousSibling = 0,
XalanNode* theNextSibling = 0,
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.cpp Sat Jul 12 23:16:42 2008
@@ -60,35 +60,6 @@
-XalanSourceTreeElementNA::XalanSourceTreeElementNA(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNA& theSource,
- bool deep) :
- XalanSourceTreeElement(theManager, theSource, deep)
-{
-}
-
-XalanSourceTreeElementNA*
-XalanSourceTreeElementNA::create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNA& theSource,
- bool deep)
-{
- typedef XalanSourceTreeElementNA ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager,
- theSource,
- deep);
-
- theGuard.release();
-
- return theResult;
-}
-
const XalanNamedNodeMap*
XalanSourceTreeElementNA::getAttributes() const
{
@@ -97,21 +68,6 @@
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeElementNA*
-#endif
-XalanSourceTreeElementNA::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeElementNA::getNamespaceURI() const
{
@@ -136,40 +92,4 @@
-const XalanDOMString&
-XalanSourceTreeElementNA::getAttribute(const XalanDOMString& /* name */) const
-{
- return s_emptyString;
-}
-
-
-
-XalanAttr*
-XalanSourceTreeElementNA::getAttributeNode(const XalanDOMString& /* name */) const
-{
- return 0;
-}
-
-
-
-const XalanDOMString&
-XalanSourceTreeElementNA::getAttributeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */) const
-{
- return s_emptyString;
-}
-
-
-
-XalanAttr*
-XalanSourceTreeElementNA::getAttributeNodeNS(
- const XalanDOMString& /* namespaceURI */,
- const XalanDOMString& /* localName */) const
-{
- return 0;
-}
-
-
-
XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNA.hpp Sat Jul 12 23:16:42 2008
@@ -66,13 +66,6 @@
virtual const XalanNamedNodeMap*
getAttributes() const;
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XalanNode*
-#else
- virtual XalanSourceTreeElementNA*
-#endif
- cloneNode(bool deep) const;
-
virtual const XalanDOMString&
getNamespaceURI() const;
@@ -82,51 +75,15 @@
virtual const XalanDOMString&
getLocalName() const;
- virtual const XalanDOMString&
- getAttribute(const XalanDOMString& name) const;
-
- virtual XalanAttr*
- getAttributeNode(const XalanDOMString& name) const;
-
- virtual const XalanDOMString&
- getAttributeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
- virtual XalanAttr*
- getAttributeNodeNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName) const;
-
-
- // public interfaces not inherited from XalanElement...
-
- XalanSourceTreeElementNA*
- clone(bool deep) const
- {
- MemoryManagerType& theManager = const_cast<XalanSourceTreeElementNA*>(this)->getMemoryManager();
-
- return XalanSourceTreeElementNA::create(theManager, *this, deep);
- }
-
protected:
- XalanSourceTreeElementNA(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNA& theSource,
- bool deep = false);
-
- static XalanSourceTreeElementNA*
- create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNA& theSource,
- bool deep = false);
-
static const XalanEmptyNamedNodeMap s_emptyAttributes;
private:
// Not implemented...
+ XalanSourceTreeElementNA(const XalanSourceTreeElementNA&);
+
XalanSourceTreeElementNA&
operator=(const XalanSourceTreeElementNA& theSource);
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.cpp Sat Jul 12 23:16:42 2008
@@ -25,7 +25,9 @@
-XalanSourceTreeElementNAAllocator::XalanSourceTreeElementNAAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanSourceTreeElementNAAllocator::XalanSourceTreeElementNAAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNAAllocator.hpp Sat Jul 12 23:16:42 2008
@@ -61,7 +61,9 @@
*
* @param theBlockSize The block size.
*/
- XalanSourceTreeElementNAAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanSourceTreeElementNAAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount);
~XalanSourceTreeElementNAAllocator();
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.cpp Sat Jul 12 23:16:42 2008
@@ -26,7 +26,7 @@
XalanSourceTreeElementNANS::XalanSourceTreeElementNANS(
- MemoryManagerType& theManager,
+ MemoryManager& theManager,
const XalanDOMString& theTagName,
const XalanDOMString& theLocalName,
const XalanDOMString& theNamespaceURI,
@@ -58,55 +58,6 @@
-XalanSourceTreeElementNANS::XalanSourceTreeElementNANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNANS& theSource,
- bool deep) :
- XalanSourceTreeElementNA(theManager, theSource, deep),
- m_localName(theSource.m_localName),
- m_prefix(theSource.m_prefix),
- m_namespaceURI(theSource.m_namespaceURI)
-{
-}
-
-XalanSourceTreeElementNANS*
-XalanSourceTreeElementNANS::create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNANS& theSource,
- bool deep)
-{
- typedef XalanSourceTreeElementNANS ThisType;
-
- XalanMemMgrAutoPtr<ThisType, false> theGuard( theManager , (ThisType*)theManager.allocate(sizeof(ThisType)));
-
- ThisType* theResult = theGuard.get();
-
- new (theResult) ThisType(theManager,
- theSource,
- deep);
-
- theGuard.release();
-
- return theResult;
-}
-
-
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeElementNANS*
-#endif
-XalanSourceTreeElementNANS::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeElementNANS::getNamespaceURI() const
{
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANS.hpp Sat Jul 12 23:16:42 2008
@@ -50,7 +50,7 @@
* @param theIndex The document-order index of the node.
*/
XalanSourceTreeElementNANS(
- MemoryManagerType& theManager,
+ MemoryManager& theManager,
const XalanDOMString& theTagName,
const XalanDOMString& theLocalName,
const XalanDOMString& theNamespaceURI,
@@ -65,13 +65,6 @@
~XalanSourceTreeElementNANS();
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual XalanNode*
-#else
- virtual XalanSourceTreeElementNANS*
-#endif
- cloneNode(bool deep) const;
-
virtual const XalanDOMString&
getNamespaceURI() const;
@@ -81,32 +74,11 @@
virtual const XalanDOMString&
getLocalName() const;
- // public interfaces not inherited from XalanElement...
-
- XalanSourceTreeElementNANS*
- clone(bool deep) const
- {
- MemoryManagerType& theManager = const_cast<XalanSourceTreeElementNANS*>(this)->getMemoryManager();
-
- return XalanSourceTreeElementNANS::create(theManager, *this, deep);
- }
-
-protected:
-
- XalanSourceTreeElementNANS(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNANS& theSource,
- bool deep = false);
-
- static XalanSourceTreeElementNANS*
- create(
- MemoryManagerType& theManager,
- const XalanSourceTreeElementNANS& theSource,
- bool deep = false);
-
private:
// Not implemented...
+ XalanSourceTreeElementNANS(const XalanSourceTreeElementNANS&);
+
XalanSourceTreeElementNANS&
operator=(const XalanSourceTreeElementNANS& theSource);
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.cpp Sat Jul 12 23:16:42 2008
@@ -25,7 +25,9 @@
-XalanSourceTreeElementNANSAllocator::XalanSourceTreeElementNANSAllocator(MemoryManagerType& theManager, size_type theBlockCount) :
+XalanSourceTreeElementNANSAllocator::XalanSourceTreeElementNANSAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount) :
m_allocator(theManager, theBlockCount)
{
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeElementNANSAllocator.hpp Sat Jul 12 23:16:42 2008
@@ -61,7 +61,9 @@
*
* @param theBlockSize The block size.
*/
- XalanSourceTreeElementNANSAllocator(MemoryManagerType& theManager, size_type theBlockCount);
+ XalanSourceTreeElementNANSAllocator(
+ MemoryManager& theManager,
+ size_type theBlockCount);
~XalanSourceTreeElementNANSAllocator();
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeParserLiaison.hpp Sat Jul 12 23:16:42 2008
@@ -202,7 +202,7 @@
* on non-validating parsers which always include non-markup text.
* <p>When set to true (also the default), ignorable whitespaces will be
* added to the DOM tree as text nodes. The method
- * DOM_Text::isIgnorableWhitespace() will return true for those text
+ * DOM_Text::isWhitespace() will return true for those text
* nodes only.
* <p>When set to false, all ignorable whitespace will be discarded and
* no text node is added to the DOM tree. Note: applications intended
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.cpp Sat Jul 12 23:16:42 2008
@@ -71,21 +71,6 @@
-XalanSourceTreeProcessingInstruction::XalanSourceTreeProcessingInstruction(
- const XalanSourceTreeProcessingInstruction& theSource,
- bool /* deep */) :
- XalanProcessingInstruction(theSource),
- m_target(theSource.m_target),
- m_data(theSource.m_data),
- m_parentNode(0),
- m_previousSibling(0),
- m_nextSibling(0),
- m_index(0)
-{
-}
-
-
-
const XalanDOMString&
XalanSourceTreeProcessingInstruction::getNodeName() const
{
@@ -186,103 +171,6 @@
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeProcessingInstruction*
-#endif
-XalanSourceTreeProcessingInstruction::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeProcessingInstruction::insertBefore(
- XalanNode* /* newChild */,
- XalanNode* /* refChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeProcessingInstruction::replaceChild(
- XalanNode* /* newChild */,
- XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeProcessingInstruction::removeChild(XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeProcessingInstruction::appendChild(XalanNode* /* newChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-bool
-XalanSourceTreeProcessingInstruction::hasChildNodes() const
-{
- return false;
-}
-
-
-
-void
-XalanSourceTreeProcessingInstruction::setNodeValue(const XalanDOMString& /* nodeValue */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeProcessingInstruction::normalize()
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeProcessingInstruction::isSupported(
- const XalanDOMString& /* feature */,
- const XalanDOMString& /* version */) const
-{
- return false;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeProcessingInstruction::getNamespaceURI() const
{
@@ -307,14 +195,6 @@
-void
-XalanSourceTreeProcessingInstruction::setPrefix(const XalanDOMString& /* prefix */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
bool
XalanSourceTreeProcessingInstruction::isIndexed() const
{
@@ -348,14 +228,6 @@
void
-XalanSourceTreeProcessingInstruction::setData(const XalanDOMString& /* theData */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
XalanSourceTreeProcessingInstruction::setParent(XalanSourceTreeElement* theParent)
{
m_parentNode = theParent;
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeProcessingInstruction.hpp Sat Jul 12 23:16:42 2008
@@ -74,391 +74,64 @@
~XalanSourceTreeProcessingInstruction();
- // These interfaces are inherited from XalanNode...
+ // These interfaces are inherited from XalanProcessingInstruction...
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 XalanSourceTreeProcessingInstruction*
-#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 XalanProcessingInstruction...
-
- //@}
- /** @name Get functions. */
- //@{
- /**
- * The target of this processing instruction.
- *
- * XML defines this as being the
- * first token following the markup that begins the processing instruction.
- */
virtual const XalanDOMString&
getTarget() const;
- /**
- * The content of this processing instruction.
- *
- * This is from the first non
- * white space character after the target to the character immediately
- * preceding the <code>?></code>.
- * @exception DOMException
- * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
- */
virtual const XalanDOMString&
getData() const;
- //@}
- /** @name Set functions. */
- //@{
- /**
- * Sets the content of this processing instruction.
- *
- * This is from the first non
- * white space character after the target to the character immediately
- * preceding the <code>?></code>.
- * @param data The string containing the processing instruction
- */
- virtual void
- setData(const XalanDOMString& data);
- //@}
-
- // public interfaces not inherited from XalanProcessingInstruction...
+ // public interfaces not inherited from XalanProcessingInstruction...
void
setParent(XalanSourceTreeElement* theParent);
@@ -496,16 +169,13 @@
m_index = theIndex;
}
-protected:
-
- XalanSourceTreeProcessingInstruction(
- const XalanSourceTreeProcessingInstruction& theSource,
- bool deep = false);
-
private:
// Not implemented...
- XalanSourceTreeProcessingInstruction&
+ XalanSourceTreeProcessingInstruction(
+ const XalanSourceTreeProcessingInstruction& theSource);
+
+ XalanSourceTreeProcessingInstruction&
operator=(const XalanSourceTreeProcessingInstruction& theSource);
bool
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeText.cpp?rev=676264&r1=676263&r2=676264&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeText.cpp Sat Jul 12 23:16:42 2008
@@ -66,20 +66,6 @@
-XalanSourceTreeText::XalanSourceTreeText(
- const XalanSourceTreeText& theSource,
- bool /* deep */) :
- XalanText(theSource),
- m_data(theSource.m_data),
- m_parentNode(0),
- m_previousSibling(0),
- m_nextSibling(0),
- m_index(0)
-{
-}
-
-
-
const XalanDOMString&
XalanSourceTreeText::getNodeName() const
{
@@ -173,103 +159,6 @@
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
-XalanNode*
-#else
-XalanSourceTreeText*
-#endif
-XalanSourceTreeText::cloneNode(bool /* deep */) const
-{
- throw XalanDOMException(XalanDOMException::NOT_SUPPORTED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeText::insertBefore(
- XalanNode* /* newChild */,
- XalanNode* /* refChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeText::replaceChild(
- XalanNode* /* newChild */,
- XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeText::removeChild(XalanNode* /* oldChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-XalanNode*
-XalanSourceTreeText::appendChild(XalanNode* /* newChild */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-
- // Dummy return value...
- return 0;
-}
-
-
-
-bool
-XalanSourceTreeText::hasChildNodes() const
-{
- return false;
-}
-
-
-
-void
-XalanSourceTreeText::setNodeValue(const XalanDOMString& /* nodeValue */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeText::normalize()
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-bool
-XalanSourceTreeText::isSupported(
- const XalanDOMString& /* feature */,
- const XalanDOMString& /* version */) const
-{
- return false;
-}
-
-
-
const XalanDOMString&
XalanSourceTreeText::getNamespaceURI() const
{
@@ -294,14 +183,6 @@
-void
-XalanSourceTreeText::setPrefix(const XalanDOMString& /* prefix */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
bool
XalanSourceTreeText::isIndexed() const
{
@@ -326,77 +207,8 @@
-unsigned int
-XalanSourceTreeText::getLength() const
-{
- assert(unsigned(length(m_data)) == length(m_data));
-
- return unsigned(length(m_data));
-}
-
-
-
-XalanDOMString&
-XalanSourceTreeText::substringData(
- unsigned int offset,
- unsigned int count,
- XalanDOMString& theResult) const
-{
- return m_data.substr(theResult, offset, count);
-}
-
-
-
-void
-XalanSourceTreeText::appendData(const XalanDOMString& /* arg */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeText::insertData(
- unsigned int /* offset */,
- const XalanDOMString& /* arg */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeText::deleteData(
- unsigned int /* offset */,
- unsigned int /* count */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-void
-XalanSourceTreeText::replaceData(
- unsigned int /* offset */,
- unsigned int /* count */,
- const XalanDOMString& /* arg */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
-}
-
-
-
-XalanText*
-XalanSourceTreeText::splitText(unsigned int /* offset */)
-{
- throw XalanDOMException(XalanDOMException::NO_MODIFICATION_ALLOWED_ERR);
- return 0;
-}
-
-
-
bool
-XalanSourceTreeText::isIgnorableWhitespace() const
+XalanSourceTreeText::isWhitespace() const
{
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org