[prev in list] [next in list] [prev in thread] [next in thread]
List: xerces-cvs
Subject: svn commit: r671894 [2/4] - in /xerces/c/trunk: samples/src/DOMPrint/
From: borisk () apache ! org
Date: 2008-06-26 13:29:24
Message-ID: 20080626132927.DE3BE2388A3A () eris ! apache ! org
[Download RAW message or body]
Modified: xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,6 +35,7 @@
* @since DOM Level 3
*/
+#include <xercesc/dom/DOMNodeFilter.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -47,7 +48,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMLSParserFilter() {};
//@}
@@ -108,57 +109,54 @@
/** @name Functions introduced in DOM Level 3 */
//@{
/**
- * This method will be called by the parser at the completion of the parsing \
of each node.
- * The node and all of its descendants will exist and be complete. The parent \
node will also exist,
- * although it may be incomplete, i.e. it may have additional children that \
have not yet been parsed. + * This method will be called by the parser at the \
completion of the parsing of each node. + * The node and all of its descendants \
will exist and be complete. The parent node will also exist, + * although it \
may be incomplete, i.e. it may have additional children that have not yet been \
parsed.
* Attribute nodes are never passed to this function.
- * From within this method, the new node may be freely modified - children may \
be added or removed,
- * text nodes modified, etc. The state of the rest of the document outside \
this node is not defined, + * From within this method, the new node may be \
freely modified - children may be added or removed, + * text nodes modified, \
etc. The state of the rest of the document outside this node is not \
defined,
* and the affect of any attempt to navigate to, or to modify any other part \
of the document is undefined.
- * For validating parsers, the checks are made on the original document, \
before any modification by the + * For validating parsers, the checks are made \
on the original document, before any modification by the
* filter. No validity checks are made on any document modifications made by \
the filter.
- * If this new node is rejected, the parser might reuse the new node and any \
of its descendants. + * If this new node is rejected, the parser might \
reuse the new node and any of its descendants.
*
- * @param node The newly constructed element. At the time this method is \
called, the element is complete -
- * it has all of its children (and their children, recursively) \
and attributes, and is attached + * @param node The newly constructed element. \
At the time this method is called, the element is complete - + * it \
has all of its children (and their children, recursively) and attributes, and is \
attached
* as a child to its parent.
* @return One of the FilterAction enum
*/
- virtual short acceptNode(DOMNode* node) = 0;
+ virtual FilterAction acceptNode(DOMNode* node) = 0;
/**
- * The parser will call this method after each <code>DOMElement</code> start \
tag has been scanned,
- * but before the remainder of the <code>DOMElement</code> is processed. The \
intent is to allow the element,
- * including any children, to be efficiently skipped. Note that only element \
nodes are passed to the + * The parser will call this method after each \
<code>DOMElement</code> start tag has been scanned, + * but before the \
remainder of the <code>DOMElement</code> is processed. The intent is to allow the \
element, + * including any children, to be efficiently skipped. Note that only \
element nodes are passed to the
* startElement function.
- * The element node passed to startElement for filtering will include all of \
the attributes, but none
- * of the children nodes. The <code>DOMElement</code> may not yet be in place \
in the document being + * The element node passed to startElement for \
filtering will include all of the attributes, but none + * of the children \
nodes. The <code>DOMElement</code> may not yet be in place in the \
document being
* constructed (it may not have a parent node.)
- * A startElement filter function may access or change the attributes for the \
<code>DOMElement</code>. + * A startElement filter function may access or \
change the attributes for the <code>DOMElement</code>.
* Changing namespace declarations will have no effect on namespace resolution \
by the parser.
*
- * @param node The newly encountered element. At the time this method is \
called, the element is incomplete - + * @param node The newly encountered \
element. At the time this method is called, the element is incomplete \
-
* it will have its attributes, but no children.
* @return One of the FilterAction enum
*/
- virtual short startElement(DOMElement* node) = 0;
+ virtual FilterAction startElement(DOMElement* node) = 0;
/**
- * Tells the <code>DOMLSParser</code> what types of nodes to show to the method \
<code>DOMLSParserFilter::acceptNode</code>.
- * If a node is not shown to the filter using this attribute, it is \
automatically included in the DOM document being built.
- * See <code>DOMNodeFilter</code> for definition of the constants. The constants \
SHOW_ATTRIBUTE, SHOW_DOCUMENT,
- * SHOW_DOCUMENT_TYPE, SHOW_NOTATION, SHOW_ENTITY, and SHOW_DOCUMENT_FRAGMENT \
are meaningless here. + * Tells the <code>DOMLSParser</code> what types of nodes \
to show to the method <code>DOMLSParserFilter::acceptNode</code>. + * If a node \
is not shown to the filter using this attribute, it is automatically included in the \
DOM document being built. + * See <code>DOMNodeFilter</code> for definition of \
the constants. The constants SHOW_ATTRIBUTE, SHOW_DOCUMENT, + * \
SHOW_DOCUMENT_TYPE, SHOW_NOTATION, SHOW_ENTITY, and SHOW_DOCUMENT_FRAGMENT are \
meaningless here.
* Those nodes will never be passed to DOMLSParserFilter::acceptNode.
*
* @return The constants of what types of nodes to show.
* @since DOM Level 3
*/
- virtual unsigned long getWhatToShow() const = 0;
+ virtual DOMNodeFilter::ShowType getWhatToShow() const = 0;
//@}
-
-private:
-
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,7 +50,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMLSSerializerFilter() {};
//@}
@@ -87,7 +87,7 @@
* Interface from <code>DOMNodeFilter</code>,
* to be implemented by implementation (derived class)
*/
- virtual short acceptNode(const DOMNode* node) const = 0;
+ virtual FilterAction acceptNode(const DOMNode* node) const = 0;
/**
* Tells the DOMLSSerializer what types of nodes to show to the filter.
@@ -98,34 +98,8 @@
* @return The constants of what types of nodes to show.
* @since DOM Level 3
*/
- virtual unsigned long getWhatToShow() const =0;
+ virtual ShowType getWhatToShow() const =0;
//@}
-
-private:
-
- // -----------------------------------------------------------------------
- // Private data members
- //
- // fWhatToShow
- //
- // The whatToShow mask.
- // Tells the DOMLSSerializer what types of nodes to show to the filter.
- // See NodeFilter for definition of the constants.
- // The constants
- // SHOW_ATTRIBUTE,
- // SHOW_DOCUMENT,
- // SHOW_DOCUMENT_TYPE,
- // SHOW_NOTATION, and
- // SHOW_DOCUMENT_FRAGMENT are meaningless here,
- // Entity nodes are not passed to the filter.
- //
- // Those nodes will never be passed to a DOMLSSerializerFilter.
- //
- // Derived class shall add this data member:
- //
- // unsigned long fWhatToShow;
- // -----------------------------------------------------------------------
-
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,11 +45,11 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMLocator() {};
//@}
-
-private:
+
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
@@ -86,7 +86,7 @@
*
* @since DOM Level 3
*/
- virtual unsigned long getLineNumber() const = 0;
+ virtual XMLSize_t getLineNumber() const = 0;
/**
* Get the column number where the error occured, or -1 if there
@@ -94,7 +94,7 @@
*
* @since DOM Level 3
*/
- virtual unsigned long getColumnNumber() const = 0;
+ virtual XMLSize_t getColumnNumber() const = 0;
/**
* Get the byte offset into the input source, or -1 if there is no byte offset \
available.
Modified: xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,11 +48,11 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMNamedNodeMap() {};
//@}
-private:
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
@@ -126,7 +126,7 @@
* index.
* @since DOM Level 1
*/
- virtual DOMNode *item(unsigned int index) const = 0;
+ virtual DOMNode *item(XMLSize_t index) const = 0;
/**
* Retrieves a node specified by name.
@@ -146,7 +146,7 @@
* 0 to <code>length-1</code> inclusive.
* @since DOM Level 1
*/
- virtual unsigned int getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
// -----------------------------------------------------------------------
// Node methods
@@ -183,7 +183,7 @@
* @since DOM Level 2
*/
virtual DOMNode *getNamedItemNS(const XMLCh *namespaceURI,
- const XMLCh *localName) const = 0;
+ const XMLCh *localName) const = 0;
/**
* Adds a node using its <CODE>namespaceURI</CODE> and <CODE>localName</CODE>.
@@ -233,7 +233,7 @@
* @since DOM Level 2
*/
virtual DOMNode *removeNamedItemNS(const XMLCh *namespaceURI,
- const XMLCh *localName) = 0;
+ const XMLCh *localName) = 0;
//@}
};
@@ -243,4 +243,3 @@
XERCES_CPP_NAMESPACE_END
#endif
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMNode.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNode.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNode.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNode.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -142,12 +142,12 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMNode() {}
DOMNode(const DOMNode &) {}
//@}
-private:
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
@@ -249,7 +249,7 @@
* An enum value representing the type of the underlying object.
* @since DOM Level 1
*/
- virtual short getNodeType() const = 0;
+ virtual NodeType getNodeType() const = 0;
/**
* Gets the parent of this node.
@@ -726,8 +726,8 @@
virtual const XMLCh* getBaseURI() const = 0;
/**
- * Compares the reference node, i.e. the node on which this method is being \
called,
- * with a node, i.e. the one passed as a parameter, with regard to their \
position + * Compares the reference node, i.e. the node on which this method is \
being called, + * with a node, i.e. the one passed as a parameter, with regard to \
their position
* in the document and according to the document order.
*
* @param other The node to compare against this node.
@@ -739,9 +739,9 @@
/**
* This attribute returns the text content of this node and its
- * descendants. No serialization is performed, the returned string
- * does not contain any markup. No whitespace normalization is
- * performed and the returned string does not contain the white
+ * descendants. No serialization is performed, the returned string
+ * does not contain any markup. No whitespace normalization is
+ * performed and the returned string does not contain the white
* spaces in element content.
*
* <br>The string returned is made of the text content of this node
@@ -774,27 +774,27 @@
* @exception DOMException
* DOMSTRING_SIZE_ERR: Raised when it would return more characters than
* fit in a <code>DOMString</code> variable on the implementation
- * platform.
+ * platform.
* @see #setTextContent
* @since DOM Level 3
*/
virtual const XMLCh* getTextContent() const = 0;
/**
- * This attribute removes any possible children this node may have and, if the
- * new string is not empty or null, replaced by a single <code>DOMText</code>
- * node containing the string this attribute is set to. No parsing is
- * performed, the input string is taken as pure textual content.
+ * This attribute removes any possible children this node may have and, if the
+ * new string is not empty or null, replaced by a single <code>DOMText</code>
+ * node containing the string this attribute is set to. No parsing is
+ * performed, the input string is taken as pure textual content.
*
* @exception DOMException
- * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
+ * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
* @see #getTextContent
* @since DOM Level 3
*/
virtual void setTextContent(const XMLCh* textContent) = 0;
/**
- * Look up the prefix associated to the given namespace URI, starting from this \
node. + * Look up the prefix associated to the given namespace URI, starting \
from this node.
* The default namespace declarations are ignored by this method.
*
* @param namespaceURI The namespace URI to look for.
@@ -867,7 +867,7 @@
* INVALID_ACCESS_ERR: Raised if this Node has a parent and thus should not be \
released yet.
*/
virtual void release() = 0;
- //@}
+ //@}
#if defined(XML_DOMREFCOUNT_EXPERIMENTAL)
// -----------------------------------------------------------------------
// Non-standard Extension
@@ -920,4 +920,3 @@
XERCES_CPP_NAMESPACE_END
#endif
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMNodeFilter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNodeFilter.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNodeFilter.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNodeFilter.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,9 +53,9 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMNodeFilter() {};
- //@}
+ //@}
private:
// -----------------------------------------------------------------------
@@ -174,7 +174,7 @@
*
* @since DOM Level 2
*/
- enum ShowType {
+ enum ShowTypeMasks {
SHOW_ALL = 0x0000FFFF,
SHOW_ELEMENT = 0x00000001,
SHOW_ATTRIBUTE = 0x00000002,
@@ -189,6 +189,9 @@
SHOW_DOCUMENT_FRAGMENT = 0x00000400,
SHOW_NOTATION = 0x00000800
};
+
+ typedef unsigned long ShowType;
+
//@}
// -----------------------------------------------------------------------
@@ -208,7 +211,7 @@
* rejected, or skipped, as defined above.
* @since DOM Level 2
*/
- virtual short acceptNode (const DOMNode* node) const =0;
+ virtual FilterAction acceptNode (const DOMNode* node) const =0;
//@}
};
Modified: xerces/c/trunk/src/xercesc/dom/DOMNodeIterator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNodeIterator.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNodeIterator.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNodeIterator.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,12 +48,12 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMNodeIterator() {}
DOMNodeIterator(const DOMNodeIterator &) {}
//@}
-private:
+private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
@@ -100,7 +100,7 @@
* @since DOM Level 2
*
*/
- virtual unsigned long getWhatToShow() = 0;
+ virtual DOMNodeFilter::ShowType getWhatToShow() = 0;
/**
* The <code>DOMNodeFilter</code> used to screen nodes.
Modified: xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -48,7 +48,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMNodeList() {};
//@}
@@ -95,7 +95,7 @@
* index.
* @since DOM Level 1
*/
- virtual DOMNode *item(unsigned int index) const = 0;
+ virtual DOMNode *item(XMLSize_t index) const = 0;
/**
* Returns the number of nodes in the list.
@@ -103,12 +103,10 @@
* The range of valid child node indices is 0 to <code>length-1</code> \
inclusive.
* @since DOM Level 1
*/
- virtual unsigned int getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
//@}
};
XERCES_CPP_NAMESPACE_END
#endif
-
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMRangeException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMRangeException.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMRangeException.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMRangeException.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,23 +27,20 @@
DOMRangeException::DOMRangeException()
: DOMException()
-, code((RangeExceptionCode) 0)
{
}
-DOMRangeException::DOMRangeException( RangeExceptionCode exCode
- , short messageCode
- , MemoryManager* const memoryManager)
-: DOMException(exCode, \
messageCode?messageCode:XMLDOMMsg::DOMRANGEEXCEPTION_ERRX+exCode, \
memoryManager)
-, code(exCode)
+DOMRangeException::DOMRangeException(short exCode,
+ short messageCode,
+ MemoryManager* const memoryManager)
+: DOMException(exCode, \
messageCode?messageCode:XMLDOMMsg::DOMRANGEEXCEPTION_ERRX+exCode-DOMRangeException::BAD_BOUNDARYPOINTS_ERR+1, \
memoryManager) {
}
DOMRangeException::DOMRangeException(const DOMRangeException &other)
: DOMException(other)
-, code(other.code)
{
}
@@ -53,4 +50,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMRangeException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMRangeException.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMRangeException.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMRangeException.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -54,8 +54,8 @@
* @since DOM Level 2
*/
enum RangeExceptionCode {
- BAD_BOUNDARYPOINTS_ERR = 1,
- INVALID_NODE_TYPE_ERR = 2
+ BAD_BOUNDARYPOINTS_ERR = 111,
+ INVALID_NODE_TYPE_ERR = 112
};
//@}
@@ -78,11 +78,9 @@
* @param messageCode The string containing the error message
* @param memoryManager The memory manager used to (de)allocate memory
*/
- DOMRangeException(
- RangeExceptionCode code
- , short messageCode
- , MemoryManager* const memoryManager
- );
+ DOMRangeException(short code,
+ short messageCode,
+ MemoryManager* const memoryManager);
/**
* Copy constructor.
@@ -104,22 +102,6 @@
virtual ~DOMRangeException();
//@}
-public:
- // -----------------------------------------------------------------------
- // Class Types
- // -----------------------------------------------------------------------
- /** @name Public variables */
- //@{
- /**
- * A code value, from the set defined by the RangeExceptionCode enum,
- * indicating the type of error that occured.
- *
- * @since DOM Level 2
- */
- RangeExceptionCode code;
-
- //@}
-
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -130,4 +112,3 @@
XERCES_CPP_NAMESPACE_END
#endif
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,8 +29,8 @@
/**
* The <code>DOMStringList</code> interface provides the abstraction of an ordered
- * collection of strings, without defining or constraining how this collection
- * is implemented. The items in the <code>DOMStringList</code> are accessible via
+ * collection of strings, without defining or constraining how this collection
+ * is implemented. The items in the <code>DOMStringList</code> are accessible via
* an integral index, starting from 0.
*/
@@ -40,7 +40,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMStringList() {};
//@}
@@ -87,7 +87,7 @@
* index.
* @since DOM Level 3
*/
- virtual const XMLCh *item(unsigned int index) const = 0;
+ virtual const XMLCh *item(XMLSize_t index) const = 0;
/**
* Returns the number of strings in the list.
@@ -96,7 +96,7 @@
*
* @since DOM Level 3
*/
- virtual unsigned int getLength() const = 0;
+ virtual XMLSize_t getLength() const = 0;
/**
* Test if a string is part of this DOMStringList
@@ -122,12 +122,10 @@
*
*/
virtual void release() = 0;
- //@}
+ //@}
};
XERCES_CPP_NAMESPACE_END
#endif
-
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMTreeWalker.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMTreeWalker.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMTreeWalker.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMTreeWalker.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,7 +53,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMTreeWalker() {}
DOMTreeWalker(const DOMTreeWalker &) {}
//@}
@@ -106,7 +106,7 @@
*
* @since DOM Level 2
*/
- virtual unsigned long getWhatToShow()= 0;
+ virtual DOMNodeFilter::ShowType getWhatToShow()= 0;
/**
* Return The filter used to screen nodes.
Modified: xerces/c/trunk/src/xercesc/dom/DOMTypeInfo.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMTypeInfo.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMTypeInfo.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMTypeInfo.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,8 +27,8 @@
XERCES_CPP_NAMESPACE_BEGIN
/**
- * The <code>DOMTypeInfo</code> interface represent a type used by
- * <code>DOMElement</code> or <code>DOMAttr</code> nodes, specified in the
+ * The <code>DOMTypeInfo</code> interface represent a type used by
+ * <code>DOMElement</code> or <code>DOMAttr</code> nodes, specified in the
* schemas associated with the document. The type is a pair of a namespace URI
* and name properties, and depends on the document's schema.
*/
@@ -39,7 +39,7 @@
// Hidden constructors
// -----------------------------------------------------------------------
/** @name Hidden constructors */
- //@{
+ //@{
DOMTypeInfo() {};
//@}
@@ -73,14 +73,14 @@
/** @name Public Contants */
//@{
/**
- * These are the available values for the derivationMethod parameter used by the \
- * method <code>DOMTypeInfo::isDerivedFrom()</code>. It is a set of possible \
types
- * of derivation, and the values represent bit positions. If a bit in the \
derivationMethod
- * parameter is set to 1, the corresponding type of derivation will be taken \
into account
- * when evaluating the derivation between the reference type definition and the \
other type
- * definition. When using the isDerivedFrom method, combining all of them in the \
- * derivationMethod parameter is equivalent to invoking the method for each of \
them separately
- * and combining the results with the OR boolean function. This specification \
only defines + * These are the available values for the derivationMethod \
parameter used by the + * method <code>DOMTypeInfo::isDerivedFrom()</code>. It is \
a set of possible types + * of derivation, and the values represent bit \
positions. If a bit in the derivationMethod + * parameter is set to 1, the \
corresponding type of derivation will be taken into account + * when evaluating \
the derivation between the reference type definition and the other type + * \
definition. When using the isDerivedFrom method, combining all of them in the + * \
derivationMethod parameter is equivalent to invoking the method for each of them \
separately + * and combining the results with the OR boolean function. This \
specification only defines
* the type of derivation for XML Schema.
*
* In addition to the types of derivation listed below, please note that:
@@ -89,38 +89,38 @@
* - any complex type does not derive from xsd:anySimpleType by restriction.
*
* <p><code>DERIVATION_EXTENSION:</code>
- * If the document's schema is an XML Schema [XML Schema Part 1], this constant \
represents the
- * derivation by extension. The reference type definition is derived by \
extension from the other
- * type definition if the other type definition can be reached recursively \
following the
- * {base type definition} property from the reference type definition, and at \
least one of the + * If the document's schema is an XML Schema [XML Schema Part \
1], this constant represents the + * derivation by extension. The reference type \
definition is derived by extension from the other + * type definition if the \
other type definition can be reached recursively following the + * {base type \
definition} property from the reference type definition, and at least \
one of the
* derivation methods involved is an extension.</p>
*
* <p><code>DERIVATION_LIST:</code>
* If the document's schema is an XML Schema [XML Schema Part 1], this constant \
represents the list.
- * The reference type definition is derived by list from the other type \
definition if there exists
- * two type definitions T1 and T2 such as the reference type definition is \
derived from T1 by
- * DERIVATION_RESTRICTION or DERIVATION_EXTENSION, T2 is derived from the other \
type definition by
- * DERIVATION_RESTRICTION, T1 has {variety} list, and T2 is the {item type \
definition}. Note that
- * T1 could be the same as the reference type definition, and T2 could be the \
same as the other + * The reference type definition is derived by list from the \
other type definition if there exists + * two type definitions T1 and T2 such as \
the reference type definition is derived from T1 by + * DERIVATION_RESTRICTION or \
DERIVATION_EXTENSION, T2 is derived from the other type definition by + * \
DERIVATION_RESTRICTION, T1 has {variety} list, and T2 is the {item type definition}. \
Note that + * T1 could be the same as the reference type definition, and T2 could \
be the same as the other
* type definition.</p>
*
* <p><code>DERIVATION_RESTRICTION:</code>
- * If the document's schema is an XML Schema [XML Schema Part 1], this constant \
represents the
- * derivation by restriction if complex types are involved, or a restriction if \
simple types are + * If the document's schema is an XML Schema [XML Schema Part \
1], this constant represents the + * derivation by restriction if complex types \
are involved, or a restriction if simple types are
* involved.
- * The reference type definition is derived by restriction from the other type \
definition if the
- * other type definition is the same as the reference type definition, or if the \
other type definition
- * can be reached recursively following the {base type definition} property from \
the reference type + * The reference type definition is derived by restriction \
from the other type definition if the + * other type definition is the same as \
the reference type definition, or if the other type definition + * can be reached \
recursively following the {base type definition} property from the \
reference type
* definition, and all the derivation methods involved are restriction.</p>
*
* <p><code>DERIVATION_UNION:</code>
- * If the document's schema is an XML Schema [XML Schema Part 1], this constant \
represents the union + * If the document's schema is an XML Schema [XML Schema \
Part 1], this constant represents the union
* if simple types are involved.
- * The reference type definition is derived by union from the other type \
definition if there exists
- * two type definitions T1 and T2 such as the reference type definition is \
derived from T1 by
- * DERIVATION_RESTRICTION or DERIVATION_EXTENSION, T2 is derived from the other \
type definition by
- * DERIVATION_RESTRICTION, T1 has {variety} union, and one of the {member type \
definitions} is T2.
- * Note that T1 could be the same as the reference type definition, and T2 could \
be the same as the + * The reference type definition is derived by union from \
the other type definition if there exists + * two type definitions T1 and T2 such \
as the reference type definition is derived from T1 by + * DERIVATION_RESTRICTION \
or DERIVATION_EXTENSION, T2 is derived from the other type definition by + * \
DERIVATION_RESTRICTION, T1 has {variety} union, and one of the {member type \
definitions} is T2. + * Note that T1 could be the same as the reference type \
definition, and T2 could be the same as the
* other type definition.</p>
*
* @since DOM Level 3
@@ -139,22 +139,22 @@
// Getter methods
// -----------------------------------------------------------------------
/**
- * Returns The name of a type declared for the associated \
<code>DOMElement</code> + * Returns The name of a type declared for the \
associated <code>DOMElement</code>
* or <code>DOMAttr</code>, or null if unknown.
*
- * @return The name of a type declared for the associated \
<code>DOMElement</code> + * @return The name of a type declared for the \
associated <code>DOMElement</code>
* or <code>DOMAttribute</code>, or null if unknown.
* @since DOM level 3
*/
virtual const XMLCh* getTypeName() const = 0;
/**
- * The namespace of the type declared for the associated <code>DOMElement</code> \
- * or <code>DOMAttr</code> or null if the <code>DOMElement</code> does not have
+ * The namespace of the type declared for the associated <code>DOMElement</code>
+ * or <code>DOMAttr</code> or null if the <code>DOMElement</code> does not have
* declaration or if no namespace information is available.
*
- * @return The namespace of the type declared for the associated \
<code>DOMElement</code>
- * or <code>DOMAttr</code> or null if the <code>DOMElement</code> does not have
+ * @return The namespace of the type declared for the associated \
<code>DOMElement</code> + * or <code>DOMAttr</code> or null if the \
<code>DOMElement</code> does not have
* declaration or if no namespace information is available.
* @since DOM level 3
*/
@@ -163,25 +163,27 @@
//@{
/**
- * This method returns if there is a derivation between the reference type \
definition,
- * i.e. the DOMTypeInfo on which the method is being called, and the other type \
definition, + * This method returns if there is a derivation between the \
reference type definition, + * i.e. the DOMTypeInfo on which the method is being \
called, and the other type definition,
* i.e. the one passed as parameters.
*
* @param typeNamespaceArg The namespace of the other type definition.
* @param typeNameArg The name of the other type definition.
- * @param derivationMethod The type of derivation and conditions applied between \
two types, + * @param derivationMethod The type of derivation and conditions \
applied between two types,
* as described in the list of constants provided in \
this interface.
- * @return If the document's schema is a DTD or no schema is associated with the \
document, + * @return If the document's schema is a DTD or no schema is \
associated with the document,
* this method will always return false.
- * If the document's schema is an XML Schema, the method will true if \
the reference
- * type definition is derived from the other type definition according \
to the derivation
- * parameter. If the value of the parameter is 0 (no bit is set to 1 for \
the
- * derivationMethod parameter), the method will return true if the other \
type definition
- * can be reached by recursing any combination of {base type \
definition}, + * If the document's schema is an XML Schema, the method \
will true if the reference + * type definition is derived from the other \
type definition according to the derivation + * parameter. If the value \
of the parameter is 0 (no bit is set to 1 for the + * derivationMethod \
parameter), the method will return true if the other type definition + * \
can be reached by recursing any combination of {base type \
definition},
* {item type definition}, or {member type definitions} from the \
reference type definition.
* @since DOM level 3
*/
- virtual bool isDerivedFrom(const XMLCh* typeNamespaceArg, const XMLCh* \
typeNameArg, unsigned long derivationMethod) const = 0; + virtual bool \
isDerivedFrom(const XMLCh* typeNamespaceArg, + const \
XMLCh* typeNameArg, + DerivationMethods \
derivationMethod) const = 0; //@}
};
Modified: xerces/c/trunk/src/xercesc/dom/DOMXPathEvaluator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMXPathEvaluator.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMXPathEvaluator.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMXPathEvaluator.hpp Thu Jun 26 06:29:21 2008
@@ -23,12 +23,12 @@
#define XERCESC_INCLUDE_GUARD_DOMXPATHEVALUATOR_HPP
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMXPathResult.hpp>
XERCES_CPP_NAMESPACE_BEGIN
class DOMXPathNSResolver;
class DOMXPathExpression;
-class DOMXPathResult;
class DOMNode;
/**
@@ -146,10 +146,9 @@
* the XPath expression into appropriate namespace URIs. If this is specified
* as null, any namespace prefix within the expression will result in
* <code>DOMException</code> being thrown with the code NAMESPACE_ERR.
- * @param type of type unsigned short - If a specific type is specified, then
- * the result will be returned as the corresponding type.
- * For XPath 1.0 results, this must be one of the codes of the \
<code>DOMXPathResult</code>
- * interface.
+ * @param result type - If a specific type is specified, then
+ * the result will be returned as the corresponding type. This must be one
+ * of the codes of the <code>DOMXPathResult</code> interface.
* @param result of type DOMXPathResult* - The result specifies a specific \
result object
* which may be reused and returned by this method. If this is specified as
* null or the implementation does not reuse the specified result, a new result
@@ -170,7 +169,7 @@
virtual DOMXPathResult* evaluate(const XMLCh *expression,
const DOMNode *contextNode,
const DOMXPathNSResolver *resolver,
- unsigned short type,
+ DOMXPathResult::ResultType type,
DOMXPathResult* result) = 0;
//@}
Modified: xerces/c/trunk/src/xercesc/dom/DOMXPathException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMXPathException.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMXPathException.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMXPathException.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,9 +31,9 @@
}
-DOMXPathException::DOMXPathException( short exCode
- , short messageCode
- , MemoryManager* const memoryManager)
+DOMXPathException::DOMXPathException(short exCode,
+ short messageCode,
+ MemoryManager* const memoryManager)
: DOMException(exCode, \
messageCode?messageCode:XMLDOMMsg::DOMXPATHEXCEPTION_ERRX+exCode-DOMXPathException::INVALID_EXPRESSION_ERR+1, \
memoryManager) {
}
@@ -50,4 +50,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/DOMXPathException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMXPathException.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMXPathException.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMXPathException.hpp Thu Jun 26 06:29:21 2008
@@ -32,6 +32,24 @@
class CDOM_EXPORT DOMXPathException : public DOMException
{
public:
+ //@{
+ /**
+ * ExceptionCode
+ * <br>INVALID_EXPRESSION_ERR The expression has a syntax error or otherwise
+ * is not a legal expression according to the rules of the specific
+ * <code>DOMXPathEvaluator</code> or contains specialized extension functions
+ * or variables not supported by this implementation.
+ * <br>TYPE_ERR The expression cannot be converted to return the specified type.
+ * <br>NO_RESULT_ERROR There is no current result in the result object.
+ */
+ enum ExceptionCode {
+ INVALID_EXPRESSION_ERR = 51,
+ TYPE_ERR = 52,
+ NO_RESULT_ERROR = 53
+ };
+ //@}
+
+public:
// -----------------------------------------------------------------------
// Constructors
// -----------------------------------------------------------------------
@@ -50,10 +68,9 @@
* @param messageCode The string containing the error message
* @param memoryManager The memory manager used to (de)allocate memory
*/
- DOMXPathException( short code
- , short messageCode = 0
- , MemoryManager* const memoryManager = \
XMLPlatformUtils::fgMemoryManager
- );
+ DOMXPathException(short code,
+ short messageCode = 0,
+ MemoryManager* const memoryManager = \
XMLPlatformUtils::fgMemoryManager);
/**
* Copy constructor.
@@ -76,25 +93,6 @@
virtual ~DOMXPathException();
//@}
-public:
-
- //@{
- /**
- * ExceptionCode
- * <br>INVALID_EXPRESSION_ERR The expression has a syntax error or otherwise
- * is not a legal expression according to the rules of the specific
- * <code>DOMXPathEvaluator</code> or contains specialized extension functions
- * or variables not supported by this implementation.
- * <br>TYPE_ERR The expression cannot be converted to return the specified type.
- * <br>NO_RESULT_ERROR There is no current result in the result object.
- */
- enum ExceptionCode {
- INVALID_EXPRESSION_ERR = 51,
- TYPE_ERR = 52,
- NO_RESULT_ERROR = 53
- };
- //@}
-
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
Modified: xerces/c/trunk/src/xercesc/dom/DOMXPathExpression.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMXPathExpression.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMXPathExpression.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMXPathExpression.hpp Thu Jun 26 06:29:21 2008
@@ -23,10 +23,10 @@
#define XERCESC_INCLUDE_GUARD_DOMXPATHEXPRESSION_HPP
#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMXPathResult.hpp>
XERCES_CPP_NAMESPACE_BEGIN
-class DOMXPathResult;
class DOMNode;
/**
@@ -86,7 +86,7 @@
* <code>DOMCDATASection</code>, then the context is interpreted as the whole \
logical
* text node as seen by XPath, unless the node is empty in which case it may not
* serve as the XPath context.
- * @param type of type unsigned short If a specific type is specified, then the \
result + * @param result type. If a specific type is specified, then the result
* will be coerced to return the specified type relying on XPath conversions and \
fail
* if the desired coercion is not possible. This must be one of the type codes \
of <code>DOMXPathResult</code>.
* @param result of type DOMXPathResult* The result specifies a specific result \
object which @@ -104,7 +104,7 @@
*/
virtual DOMXPathResult* evaluate(const DOMNode *contextNode,
- unsigned short type,
+ DOMXPathResult::ResultType type,
DOMXPathResult* result) const = 0;
//@}
Modified: xerces/c/trunk/src/xercesc/dom/DOMXPathResult.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMXPathResult.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMXPathResult.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMXPathResult.hpp Thu Jun 26 06:29:21 2008
@@ -160,7 +160,7 @@
* and any items in the snapshot may have been altered, moved, or removed from
* the document.
*/
- enum resultType {
+ enum ResultType {
/* XPath 1.0 */
ANY_TYPE = 0,
NUMBER_TYPE = 1,
@@ -188,10 +188,10 @@
/**
* Returns the result type of this result
- * @return resultType
+ * @return ResultType
* A code representing the type of this result, as defined by the type \
constants.
*/
- virtual short getResultType() const = 0;
+ virtual ResultType getResultType() const = 0;
/**
* Returns the DOM type info of the current result node or value
@@ -214,7 +214,7 @@
* @return booleanValue of type boolean
* The value of this boolean result.
* @exception DOMXPathException
- * TYPE_ERR: raised if resultType is not BOOLEAN_TYPE (XPath 1.0) or
+ * TYPE_ERR: raised if ResultType is not BOOLEAN_TYPE (XPath 1.0) or
* if current result cannot be properly converted to boolean (XPath 2.0).
* <br>
* NO_RESULT_ERROR: raised if there is no current result in the result object \
(XPath 2.0). @@ -241,7 +241,7 @@
* expression, then it is up to the definition of the binding to specify how
* the XPath number is converted to the native binding number.
* @exception DOMXPathException
- * TYPE_ERR: raised if resultType is not NUMBER_TYPE (XPath 1.0) or
+ * TYPE_ERR: raised if ResultType is not NUMBER_TYPE (XPath 1.0) or
* if current result cannot be properly converted to double (XPath 2.0).
* <br>
* NO_RESULT_ERROR: raised if there is no current result in the result object \
(XPath 2.0). @@ -253,7 +253,7 @@
* @return stringValue
* The value of this string result.
* @exception DOMXPathException
- * TYPE_ERR: raised if resultType is not STRING_TYPE (XPath 1.0) or
+ * TYPE_ERR: raised if ResultType is not STRING_TYPE (XPath 1.0) or
* if current result cannot be properly converted to string (XPath 2.0).
* <br>
* NO_RESULT_ERROR: raised if there is no current result in the result object \
(XPath 2.0). @@ -265,7 +265,7 @@
* @return nodeValue
* The value of this node result, which may be null.
* @exception DOMXPathException
- * TYPE_ERR: raised if resultType is not ANY_UNORDERED_NODE_TYPE,
+ * TYPE_ERR: raised if ResultType is not ANY_UNORDERED_NODE_TYPE,
* FIRST_ORDERED_NODE_TYPE, UNORDERED_NODE_ITERATOR_TYPE,
* ORDERED_NODE_ITERATOR_TYPE, UNORDERED_NODE_SNAPSHOT_TYPE, or
* ORDERED_NODE_SNAPSHOT_TYPE (XPath 1.0) or if current result is
@@ -282,8 +282,8 @@
* @return boolean True if the current result is the next item from the sequence
* or false if there are no more items.
* @exception XPathException
- * TYPE_ERR: raised if resultType is not UNORDERED_NODE_ITERATOR_TYPE or
- * ORDERED_NODE_ITERATOR_TYPE (XPath 1.0) or if resultType is not
+ * TYPE_ERR: raised if ResultType is not UNORDERED_NODE_ITERATOR_TYPE or
+ * ORDERED_NODE_ITERATOR_TYPE (XPath 1.0) or if ResultType is not
* ITERATOR_RESULT_TYPE (XPath 2.0).
* @exception DOMException
* INVALID_STATE_ERR: The document has been mutated since the result was \
returned. @@ -293,12 +293,12 @@
/**
* Signifies that the iterator has become invalid.
* @return invalidIteratorState
- * True if resultType is UNORDERED_NODE_ITERATOR_TYPE or
+ * True if ResultType is UNORDERED_NODE_ITERATOR_TYPE or
* ORDERED_NODE_ITERATOR_TYPE (XPath 1.0) or ITERATOR_RESULT_TYPE (XPath 2.0)
* and the document has been modified since this result was returned.
* @exception XPathException
- * TYPE_ERR: raised if resultType is not UNORDERED_NODE_ITERATOR_TYPE or
- * ORDERED_NODE_ITERATOR_TYPE (XPath 1.0) or if resultType is not
+ * TYPE_ERR: raised if ResultType is not UNORDERED_NODE_ITERATOR_TYPE or
+ * ORDERED_NODE_ITERATOR_TYPE (XPath 1.0) or if ResultType is not
* ITERATOR_RESULT_TYPE (XPath 2.0).
*/
virtual bool getInvalidIteratorState() const = 0;
@@ -312,8 +312,8 @@
* @return boolean True if the current result is the next item from the sequence
* or false if there are no more items.
* @exception XPathException
- * TYPE_ERR: raised if resultType is not UNORDERED_NODE_SNAPSHOT_TYPE or
- * ORDERED_NODE_SNAPSHOT_TYPE (XPath 1.0) or if resultType is not
+ * TYPE_ERR: raised if ResultType is not UNORDERED_NODE_SNAPSHOT_TYPE or
+ * ORDERED_NODE_SNAPSHOT_TYPE (XPath 1.0) or if ResultType is not
* SNAPSHOT_RESULT_TYPE (XPath 2.0).
*/
virtual bool snapshotItem(XMLSize_t) = 0;
@@ -323,8 +323,8 @@
* indices are 0 to snapshotLength-1 inclusive.
* @return snapshotLength of type XMLSize_t
* @exception XPathException
- * TYPE_ERR: raised if resultType is not UNORDERED_NODE_SNAPSHOT_TYPE or
- * ORDERED_NODE_SNAPSHOT_TYPE (XPath 1.0) or if resultType is not
+ * TYPE_ERR: raised if ResultType is not UNORDERED_NODE_SNAPSHOT_TYPE or
+ * ORDERED_NODE_SNAPSHOT_TYPE (XPath 1.0) or if ResultType is not
* SNAPSHOT_RESULT_TYPE (XPath 2.0).
*/
virtual XMLSize_t getSnapshotLength() const = 0;
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
, fParent (other.fParent)
, fName(other.fName)
, fSchemaType(other.fSchemaType)
-{
+{
if (other.fNode.isSpecified())
fNode.isSpecified(true);
else
@@ -77,8 +77,7 @@
return fName;
}
-
-short DOMAttrImpl::getNodeType() const {
+DOMNode::NodeType DOMAttrImpl::getNodeType() const {
return DOMNode::ATTRIBUTE_NODE;
}
@@ -297,7 +296,7 @@
}
-void DOMAttrImpl::setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo)
+void DOMAttrImpl::setSchemaTypeInfo(const DOMTypeInfoImpl* typeInfo)
{
fSchemaType = typeInfo;
}
@@ -314,7 +313,7 @@
{
if(XMLString::equals(feature, XMLUni::fgXercescInterfacePSVITypeInfo))
return (DOMPSVITypeInfo*)fSchemaType;
- return fNode.getFeature(feature, version);
+ return fNode.getFeature(feature, version);
}
DOMNode* DOMAttrImpl::appendChild(DOMNode *newChild) \
{return fParent.appendChild (newChild); } @@ -352,4 +351,3 @@
const XMLCh* DOMAttrImpl::lookupNamespaceURI(const XMLCh* prefix) \
const {return fNode.lookupNamespaceURI(prefix); }
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,14 +66,14 @@
fNodes->reset();
else
{
- unsigned int size = srcmap->fNodes->size();
+ XMLSize_t size = srcmap->fNodes->size();
if(size > 0) {
DOMDocumentImpl *doc = \
(DOMDocumentImpl*)fOwnerNode->getOwnerDocument(); fNodes = new (doc) \
DOMNodeVector(doc, size); }
}
- for (unsigned int i = 0; i < srcmap->fNodes->size(); i++)
+ for (XMLSize_t i = 0; i < srcmap->fNodes->size(); i++)
{
DOMNode *n = srcmap->fNodes->elementAt(i);
DOMNode *clone = n->cloneNode(true);
@@ -98,8 +98,8 @@
// this->fReadOnly=readOnl;
if(deep && fNodes!=0)
{
- unsigned int sz = fNodes->size();
- for (unsigned int i=0; i<sz; ++i) {
+ XMLSize_t sz = fNodes->size();
+ for (XMLSize_t i=0; i<sz; ++i) {
castToNodeImpl(fNodes->elementAt(i))->setReadOnly(readOnl, deep);
}
}
@@ -111,7 +111,6 @@
int DOMAttrMapImpl::findNamePoint(const XMLCh *name) const
{
-
// Binary search
int i=0;
if(fNodes!=0)
@@ -337,7 +336,7 @@
// remove the name using index
// avoid calling findNamePoint again if the index is already known
-DOMNode * DOMAttrMapImpl::removeNamedItemAt(unsigned int index)
+DOMNode * DOMAttrMapImpl::removeNamedItemAt(XMLSize_t index)
{
if (this->readOnly())
throw DOMException(
@@ -432,12 +431,12 @@
}
} // moveSpecifiedAttributes(AttributeMap):void
-unsigned int DOMAttrMapImpl::getLength() const
+XMLSize_t DOMAttrMapImpl::getLength() const
{
return (fNodes != 0) ? fNodes->size() : 0;
}
-DOMNode * DOMAttrMapImpl::item(unsigned int index) const
+DOMNode * DOMAttrMapImpl::item(XMLSize_t index) const
{
return (fNodes != 0 && index < fNodes->size()) ?
fNodes->elementAt(index) : 0;
@@ -445,4 +444,3 @@
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -66,17 +66,17 @@
virtual int findNamePoint(const XMLCh *name) const;
virtual int findNamePoint(const XMLCh *namespaceURI,
const XMLCh *localName) const;
- virtual DOMNode* removeNamedItemAt(unsigned int index);
+ virtual DOMNode* removeNamedItemAt(XMLSize_t index);
virtual void setReadOnly(bool readOnly, bool deep);
- virtual unsigned int getLength() const;
- virtual DOMNode* item(unsigned int index) const;
+ virtual XMLSize_t getLength() const;
+ virtual DOMNode* item(XMLSize_t index) const;
virtual DOMNode* getNamedItem(const XMLCh *name) const;
virtual DOMNode* setNamedItem(DOMNode *arg);
virtual DOMNode* removeNamedItem(const XMLCh *name);
-
+
virtual DOMNode* getNamedItemNS(const XMLCh *namespaceURI,
const XMLCh *localName) const;
virtual DOMNode* setNamedItemNS(DOMNode *arg);
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp Thu Jun 26 06:29:21 \
2008 @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -70,7 +70,7 @@
}
-short DOMCDATASectionImpl::getNodeType() const {
+DOMNode::NodeType DOMCDATASectionImpl::getNodeType() const {
return DOMNode::CDATA_SECTION_NODE;
}
@@ -126,11 +126,11 @@
return isIgnorableWhitespace();
}
-const XMLCh* DOMCDATASectionImpl::getWholeText() const
+const XMLCh* DOMCDATASectionImpl::getWholeText() const
{
DOMTreeWalker* pWalker=getOwnerDocument()->createTreeWalker(getOwnerDocument()->getDocumentElement(), \
DOMNodeFilter::SHOW_ALL, NULL, true); pWalker->setCurrentNode((DOMNode*)this);
- // Logically-adjacent text nodes are Text or CDATASection nodes that can be \
visited sequentially in document order or in + // Logically-adjacent text nodes \
are Text or CDATASection nodes that can be visited sequentially in document order or \
in
// reversed document order without entering, exiting, or passing over Element, \
Comment, or ProcessingInstruction nodes. DOMNode* prevNode;
while((prevNode=pWalker->previousNode())!=NULL)
@@ -158,7 +158,7 @@
{
DOMTreeWalker* pWalker=getOwnerDocument()->createTreeWalker(getOwnerDocument()->getDocumentElement(), \
DOMNodeFilter::SHOW_ALL, NULL, true); pWalker->setCurrentNode((DOMNode*)this);
- // Logically-adjacent text nodes are Text or CDATASection nodes that can be \
visited sequentially in document order or in + // Logically-adjacent text nodes \
are Text or CDATASection nodes that can be visited sequentially in document order or \
in
// reversed document order without entering, exiting, or passing over Element, \
Comment, or ProcessingInstruction nodes. DOMNode* pFirstTextNode=this;
DOMNode* prevNode;
@@ -306,5 +306,3 @@
void DOMCDATASectionImpl::setNodeValue(const XMLCh \
*nodeValue) {fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
-
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
return gComment;
}
-short DOMCommentImpl::getNodeType() const {
+DOMNode::NodeType DOMCommentImpl::getNodeType() const {
return DOMNode::COMMENT_NODE;
}
@@ -187,4 +187,3 @@
void DOMCommentImpl::setNodeValue(const XMLCh *nodeValue) \
{fCharacterData.setNodeValue (this, nodeValue); }
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp Thu Jun 26 06:29:21 \
2008 @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -69,7 +69,7 @@
{
}
-unsigned int DOMDeepNodeListImpl::getLength() const
+XMLSize_t DOMDeepNodeListImpl::getLength() const
{
// Reset cache to beginning of list
item(0);
@@ -80,7 +80,7 @@
}
-DOMNode *DOMDeepNodeListImpl::item(unsigned int index) const
+DOMNode *DOMDeepNodeListImpl::item(XMLSize_t index) const
{
return ((DOMDeepNodeListImpl*)this)->cacheItem(index);
}
@@ -95,9 +95,9 @@
// irrelevant ones. Doing so in a really useful manner would seem
// to involve a tree-walk in its own right, or maintaining our data
// in a parallel tree.
-DOMNode *DOMDeepNodeListImpl::cacheItem(unsigned int index)
+DOMNode *DOMDeepNodeListImpl::cacheItem(XMLSize_t index)
{
- unsigned int currentIndexPlus1 = fCurrentIndexPlus1;
+ XMLSize_t currentIndexPlus1 = fCurrentIndexPlus1;
DOMNode *currentNode = fCurrentNode;
if (castToParentImpl(fRootNode)->changes() != fChanges)
@@ -215,4 +215,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp Thu Jun 26 06:29:21 \
2008 @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,11 +47,11 @@
bool fMatchAll;
int fChanges;
DOMNode* fCurrentNode;
- unsigned int fCurrentIndexPlus1;
+ XMLSize_t fCurrentIndexPlus1;
//DOM Level 2
const XMLCh* fNamespaceURI;
- bool fMatchAllURI;
+ bool fMatchAllURI;
bool fMatchURIandTagname; //match both namespaceURI and tagName
public:
@@ -60,19 +60,19 @@
const XMLCh *namespaceURI,
const XMLCh *localName);
virtual ~DOMDeepNodeListImpl();
- virtual unsigned int getLength() const;
- virtual DOMNode* item(unsigned int index) const;
- DOMNode* cacheItem(unsigned int index);
+ virtual XMLSize_t getLength() const;
+ virtual DOMNode* item(XMLSize_t index) const;
+ DOMNode* cacheItem(XMLSize_t index);
protected:
DOMNode* nextMatchingElementAfter(DOMNode *current);
-
+
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
// -----------------------------------------------------------------------
DOMDeepNodeListImpl(const DOMDeepNodeListImpl &);
- DOMDeepNodeListImpl & operator = (const DOMDeepNodeListImpl &);
+ DOMDeepNodeListImpl & operator = (const DOMDeepNodeListImpl &);
};
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp Thu Jun 26 \
06:29:21 2008 @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -65,7 +65,7 @@
}
-short DOMDocumentFragmentImpl::getNodeType() const {
+DOMNode::NodeType DOMDocumentFragmentImpl::getNodeType() const {
return DOMNode::DOCUMENT_FRAGMENT_NODE;
}
@@ -135,5 +135,3 @@
void* DOMDocumentFragmentImpl::getFeature(const XMLCh* \
feature, const XMLCh* version) const {return fNode.getFeature(feature, version); }
XERCES_CPP_NAMESPACE_END
-
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp Thu Jun 26 06:29:21 2008
@@ -242,7 +242,7 @@
}
-short DOMDocumentImpl::getNodeType() const {
+DOMNode::NodeType DOMDocumentImpl::getNodeType() const {
return DOMNode::DOCUMENT_NODE;
}
@@ -383,7 +383,10 @@
DOMNodeIterator* DOMDocumentImpl::createNodeIterator (
- DOMNode *root, unsigned long whatToShow, DOMNodeFilter* filter, bool \
entityReferenceExpansion) + DOMNode *root,
+ DOMNodeFilter::ShowType whatToShow,
+ DOMNodeFilter* filter,
+ bool entityReferenceExpansion)
{
if (!root) {
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
@@ -436,7 +439,7 @@
DOMXPathResult* DOMDocumentImpl::evaluate(const XMLCh *expression,
const DOMNode *contextNode,
const DOMXPathNSResolver *resolver,
- unsigned short type,
+ DOMXPathResult::ResultType type,
DOMXPathResult* result)
{
JanitorMemFunCall<DOMXPathExpression> expr(
@@ -447,7 +450,11 @@
-DOMTreeWalker* DOMDocumentImpl::createTreeWalker (DOMNode *root, unsigned long \
whatToShow, DOMNodeFilter* filter, bool entityReferenceExpansion) +DOMTreeWalker* \
DOMDocumentImpl::createTreeWalker ( + DOMNode *root,
+ DOMNodeFilter::ShowType whatToShow,
+ DOMNodeFilter* filter,
+ bool entityReferenceExpansion)
{
if (!root) {
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0, getMemoryManager());
@@ -594,8 +601,8 @@
DOMElement *DOMDocumentImpl::createElementNS(const XMLCh *fNamespaceURI,
const XMLCh *qualifiedName,
- const unsigned long lineNo,
- const unsigned long columnNo)
+ const XMLSize_t lineNo,
+ const XMLSize_t columnNo)
{
if(!qualifiedName || !isXMLName(qualifiedName))
throw DOMException(DOMException::INVALID_CHARACTER_ERR,0, \
getMemoryManager());
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp Thu Jun 26 06:29:21 2008
@@ -126,11 +126,11 @@
virtual DOMImplementation* getImplementation() const;
bool isXMLName(const XMLCh * s);
virtual DOMNodeIterator* createNodeIterator(DOMNode *root,
- unsigned long whatToShow,
+ DOMNodeFilter::ShowType \
whatToShow,
DOMNodeFilter* filter,
bool entityReferenceExpansion);
virtual DOMTreeWalker* createTreeWalker(DOMNode *root,
- unsigned long whatToShow,
+ DOMNodeFilter::ShowType \
whatToShow, DOMNodeFilter* filter,
bool entityReferenceExpansion);
@@ -147,7 +147,7 @@
virtual DOMXPathResult* evaluate(const XMLCh *expression,
const DOMNode *contextNode,
const DOMXPathNSResolver *resolver,
- unsigned short type,
+ DOMXPathResult::ResultType type,
DOMXPathResult* result);
@@ -204,8 +204,8 @@
const XMLCh *qualifiedName);
virtual DOMElement* createElementNS(const XMLCh *namespaceURI,
const XMLCh *qualifiedName,
- const unsigned long lineNo,
- const unsigned long columnNo);
+ const XMLSize_t lineNo,
+ const XMLSize_t columnNo);
virtual DOMAttr* createAttributeNS(const XMLCh *namespaceURI,
const XMLCh *qualifiedName);
virtual DOMNodeList* getElementsByTagNameNS(const XMLCh *namespaceURI,
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp Thu Jun 26 06:29:21 \
2008 @@ -242,7 +242,7 @@
}
-short DOMDocumentTypeImpl::getNodeType() const {
+DOMNode::NodeType DOMDocumentTypeImpl::getNodeType() const {
return DOMNode::DOCUMENT_TYPE_NODE;
}
@@ -531,4 +531,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -118,7 +118,7 @@
}
-short DOMElementImpl::getNodeType() const {
+DOMNode::NodeType DOMElementImpl::getNodeType() const {
return DOMNode::ELEMENT_NODE;
}
@@ -237,7 +237,7 @@
DOMAttr *attr = getAttributeNode(name);
- if (!attr)
+ if (!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
if(isId)
@@ -254,7 +254,7 @@
DOMAttr *attr = getAttributeNodeNS(namespaceURI, localName);
- if (!attr)
+ if (!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
if(isId)
@@ -274,10 +274,10 @@
const XMLCh* localName = idAttr->getLocalName();
if (localName)
attr = getAttributeNodeNS(idAttr->getNamespaceURI(), \
idAttr->getLocalName());
- else
+ else
attr = getAttributeNode(idAttr->getName());
-
- if(!attr)
+
+ if(!attr)
throw DOMException(DOMException::NOT_FOUND_ERR, 0, GetDOMNodeMemoryManager);
if(isId)
@@ -672,4 +672,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,10 +36,10 @@
fRefEntity(0),
fInputEncoding(0),
fXmlEncoding(0),
- fXmlVersion(0),
+ fXmlVersion(0),
fBaseURI(0),
fEntityRefNodeCloned(false)
-{
+{
fName = ((DOMDocumentImpl *)ownerDoc)->getPooledString(eName);
fNode.setReadOnly(true, true);
}
@@ -59,9 +59,9 @@
fXmlVersion(other.fXmlVersion),
fBaseURI(other.fBaseURI),
fEntityRefNodeCloned(false)
-{
+{
if (deep)
- fParent.cloneChildren(&other);
+ fParent.cloneChildren(&other);
fNode.setReadOnly(true, true);
}
@@ -83,7 +83,7 @@
}
-short DOMEntityImpl::getNodeType() const {
+DOMNode::NodeType DOMEntityImpl::getNodeType() const {
return DOMNode::ENTITY_NODE;
}
@@ -293,4 +293,3 @@
}
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp Thu Jun 26 \
06:29:21 2008 @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -90,13 +90,13 @@
DOMEntityReferenceImpl::DOMEntityReferenceImpl(const DOMEntityReferenceImpl &other,
bool deep)
- : DOMEntityReference(other),
- fNode(other.fNode),
- fParent(other.fParent),
- fChild(other.fChild),
- fName(other.fName),
+ : DOMEntityReference(other),
+ fNode(other.fNode),
+ fParent(other.fParent),
+ fChild(other.fChild),
+ fName(other.fName),
fBaseURI(other.fBaseURI)
-{
+{
if (deep)
fParent.cloneChildren(&other);
fNode.setReadOnly(true, true);
@@ -122,7 +122,7 @@
}
-short DOMEntityReferenceImpl::getNodeType() const {
+DOMNode::NodeType DOMEntityReferenceImpl::getNodeType() const {
return DOMNode::ENTITY_REFERENCE_NODE;
}
@@ -221,4 +221,3 @@
void* DOMEntityReferenceImpl::getFeature(const XMLCh* feature, \
const XMLCh* version) const {return fNode.getFeature(feature, version); }
XERCES_CPP_NAMESPACE_END
-
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.cpp Thu Jun 26 06:29:21 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
// ---------------------------------------------------------------------------
// DOMErrorImpl: Constructors and Destructor
// ---------------------------------------------------------------------------
-DOMErrorImpl::DOMErrorImpl(const short severity) :
+DOMErrorImpl::DOMErrorImpl(const ErrorSeverity severity) :
fAdoptLocation(false)
, fSeverity(severity)
, fMessage(0)
@@ -39,7 +39,7 @@
{
}
-DOMErrorImpl::DOMErrorImpl(const short severity,
+DOMErrorImpl::DOMErrorImpl(const ErrorSeverity severity,
const XMLCh* const message,
DOMLocator* const location) :
fAdoptLocation(false)
@@ -51,7 +51,7 @@
{
}
-DOMErrorImpl::DOMErrorImpl(const short severity,
+DOMErrorImpl::DOMErrorImpl(const ErrorSeverity severity,
const XMLCh* type,
const XMLCh* message,
void* relatedData) :
@@ -88,4 +88,3 @@
}
XERCES_CPP_NAMESPACE_END
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic