You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by bo...@apache.org on 2008/06/26 15:29:24 UTC

svn commit: r671894 [1/4] - in /xerces/c/trunk: samples/src/DOMPrint/ src/xercesc/dom/ src/xercesc/dom/impl/ src/xercesc/parsers/ tests/src/DOM/DOMTest/ tests/src/DOM/Traversal/

Author: borisk
Date: Thu Jun 26 06:29:21 2008
New Revision: 671894

URL: http://svn.apache.org/viewvc?rev=671894&view=rev
Log:
Use XMLSize_t instead of int/long for indexes and sizes in DOM interfaces. Use enum types instead of short.

Modified:
    xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp
    xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp
    xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp
    xerces/c/trunk/src/xercesc/dom/DOMDocumentTraversal.hpp
    xerces/c/trunk/src/xercesc/dom/DOMError.hpp
    xerces/c/trunk/src/xercesc/dom/DOMException.cpp
    xerces/c/trunk/src/xercesc/dom/DOMException.hpp
    xerces/c/trunk/src/xercesc/dom/DOMImplementation.hpp
    xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.hpp
    xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp
    xerces/c/trunk/src/xercesc/dom/DOMLSException.cpp
    xerces/c/trunk/src/xercesc/dom/DOMLSException.hpp
    xerces/c/trunk/src/xercesc/dom/DOMLSParser.hpp
    xerces/c/trunk/src/xercesc/dom/DOMLSParserFilter.hpp
    xerces/c/trunk/src/xercesc/dom/DOMLSSerializerFilter.hpp
    xerces/c/trunk/src/xercesc/dom/DOMLocator.hpp
    xerces/c/trunk/src/xercesc/dom/DOMNamedNodeMap.hpp
    xerces/c/trunk/src/xercesc/dom/DOMNode.hpp
    xerces/c/trunk/src/xercesc/dom/DOMNodeFilter.hpp
    xerces/c/trunk/src/xercesc/dom/DOMNodeIterator.hpp
    xerces/c/trunk/src/xercesc/dom/DOMNodeList.hpp
    xerces/c/trunk/src/xercesc/dom/DOMRangeException.cpp
    xerces/c/trunk/src/xercesc/dom/DOMRangeException.hpp
    xerces/c/trunk/src/xercesc/dom/DOMStringList.hpp
    xerces/c/trunk/src/xercesc/dom/DOMTreeWalker.hpp
    xerces/c/trunk/src/xercesc/dom/DOMTypeInfo.hpp
    xerces/c/trunk/src/xercesc/dom/DOMXPathEvaluator.hpp
    xerces/c/trunk/src/xercesc/dom/DOMXPathException.cpp
    xerces/c/trunk/src/xercesc/dom/DOMXPathException.hpp
    xerces/c/trunk/src/xercesc/dom/DOMXPathExpression.hpp
    xerces/c/trunk/src/xercesc/dom/DOMXPathResult.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMAttrImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMAttrMapImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMCDATASectionImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMCommentImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDeepNodeListImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentFragmentImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMDocumentTypeImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMElementImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMEntityImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMEntityReferenceImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMErrorImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMImplementationListImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMLocatorImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNodeImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNodeListImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNormalizer.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMNotationImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMProcessingInstructionImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMStringListImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMTextImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMTreeWalkerImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMTypeInfoImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMXPathExpressionImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/DOMXPathResultImpl.hpp
    xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.cpp
    xerces/c/trunk/src/xercesc/dom/impl/XSDElementNSImpl.hpp
    xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
    xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
    xerces/c/trunk/tests/src/DOM/DOMTest/DTest.cpp
    xerces/c/trunk/tests/src/DOM/Traversal/Traversal.cpp

Modified: xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.cpp (original)
+++ xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.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.
@@ -25,29 +25,30 @@
 
 static const XMLCh  element_person[]=
 {
-	chLatin_p, chLatin_e, chLatin_r, chLatin_s, chLatin_o, chLatin_n, chNull 
+	chLatin_p, chLatin_e, chLatin_r, chLatin_s, chLatin_o, chLatin_n, chNull
 };
 
 static const XMLCh  element_link[]=
 {
-	chLatin_l, chLatin_i, chLatin_n, chLatin_k, chNull 
+	chLatin_l, chLatin_i, chLatin_n, chLatin_k, chNull
 };
 
-DOMPrintFilter::DOMPrintFilter(unsigned long whatToShow)
+DOMPrintFilter::DOMPrintFilter(ShowType whatToShow)
 :fWhatToShow(whatToShow)
 {}
 
-short DOMPrintFilter::acceptNode(const DOMNode* node) const
+DOMNodeFilter::FilterAction DOMPrintFilter::
+acceptNode(const DOMNode* node) const
 {
 	//
-	// The DOMLSSerializer shall call getWhatToShow() before calling 
-	// acceptNode(), to show nodes which are supposed to be 
+	// The DOMLSSerializer shall call getWhatToShow() before calling
+	// acceptNode(), to show nodes which are supposed to be
 	// shown to this filter.
-	// 
-	// REVISIT: In case the DOMLSSerializer does not follow the protocol, 
+	//
+	// REVISIT: In case the DOMLSSerializer does not follow the protocol,
 	//          Shall the filter honour, or NOT, what it claims
 	//          it is interested in ?
-	// 
+	//
 	// The DOMLS specs does not specify that acceptNode() shall do
 	// this way, or not, so it is up the implementation,
 	// to skip the code below for the sake of performance ...
@@ -108,4 +109,3 @@
 
 	return DOMNodeFilter::FILTER_ACCEPT;
 }
-

Modified: xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.hpp (original)
+++ xerces/c/trunk/samples/src/DOMPrint/DOMPrintFilter.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.
@@ -34,27 +34,18 @@
 class DOMPrintFilter : public DOMLSSerializerFilter {
 public:
 
-    /** @name Constructors */
-	DOMPrintFilter(unsigned long whatToShow = DOMNodeFilter::SHOW_ALL);
-    //@{
-
-    /** @name Destructors */
-	~DOMPrintFilter(){};
-    //@{
-
-	/** @ interface from DOMWriterFilter */
-	virtual short acceptNode(const DOMNode*) const;
-    //@{
+    DOMPrintFilter(ShowType whatToShow = DOMNodeFilter::SHOW_ALL);
+    ~DOMPrintFilter(){};
 
-	virtual unsigned long getWhatToShow() const {return fWhatToShow;};
+    virtual FilterAction acceptNode(const DOMNode*) const;
+    virtual ShowType getWhatToShow() const {return fWhatToShow;};
 
 private:
-	// unimplemented copy ctor and assignement operator
-	DOMPrintFilter(const DOMPrintFilter&);
-	DOMPrintFilter & operator = (const DOMPrintFilter&);
-
-	unsigned long fWhatToShow;
+    // unimplemented copy ctor and assignement operator
+    DOMPrintFilter(const DOMPrintFilter&);
+    DOMPrintFilter & operator = (const DOMPrintFilter&);
 
+    ShowType fWhatToShow;
 };
 
 #endif

Modified: xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMDocument.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMDocument.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.
@@ -72,7 +72,7 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
     DOMDocument() {};
     //@}
 
@@ -517,7 +517,7 @@
     //@{
 
     /**
-     * An attribute specifying the encoding used for this document at the time of the parsing. 
+     * An attribute specifying the encoding used for this document at the time of the parsing.
      * This is <code>null</code> when it is not known, such as when the DOMDocument was created in memory.
      *
      * @since DOM Level 3
@@ -525,8 +525,8 @@
     virtual const XMLCh*           getInputEncoding() const = 0;
 
     /**
-     * An attribute specifying, as part of the XML declaration, the encoding of this document. 
-     * This is <code>null</code> when unspecified or when it is not known, such as when the 
+     * An attribute specifying, as part of the XML declaration, the encoding of this document.
+     * This is <code>null</code> when unspecified or when it is not known, such as when the
      * DOMDocument was created in memory.
      *
      * @since DOM Level 3
@@ -534,7 +534,7 @@
     virtual const XMLCh*           getXmlEncoding() const = 0;
 
     /**
-     * An attribute specifying, as part of the XML declaration, whether this document is standalone. 
+     * An attribute specifying, as part of the XML declaration, whether this document is standalone.
      * This is <code>false</code> when unspecified.
      *
      * @since DOM Level 3
@@ -721,7 +721,7 @@
     /**
      * This method acts as if the document was going through a save and load
      * cycle, putting the document in a "normal" form. The actual result
-     * depends on the features being set. See <code>DOMConfiguration</code> for 
+     * depends on the features being set. See <code>DOMConfiguration</code> for
      * details.
      *
      * <br>Noticeably this method normalizes <code>DOMText</code> nodes, makes
@@ -733,9 +733,9 @@
      * <br>Mutation events, when supported, are generated to reflect the
      * changes occuring on the document.
      * Note that this is a partial implementation. Not all the required features are implemented.
-     * Currently <code>DOMAttr</code> and <code>DOMText</code> nodes are normalized. 
+     * Currently <code>DOMAttr</code> and <code>DOMText</code> nodes are normalized.
      * Features to remove <code>DOMComment</code> and <code>DOMCDATASection</code> work.
-     * @since DOM Level 3 
+     * @since DOM Level 3
      *
      */
     virtual void                   normalizeDocument() = 0;
@@ -743,7 +743,7 @@
 
     /**
      * The configuration used when DOMDocument::normalizeDocument is invoked.
-     * 
+     *
      * @return The <code>DOMConfiguration</code> from this <code>DOMDocument</code>
      *
      * @since DOM Level 3
@@ -806,10 +806,10 @@
      *
      * @see createElementNS(const XMLCh *namespaceURI, const XMLCh *qualifiedName)
      */
-    virtual DOMElement         *createElementNS(const XMLCh *namespaceURI,
-                                                  const XMLCh *qualifiedName,
-                                                  const unsigned long lineNum,
-                                                  const unsigned long columnNum) = 0;
+    virtual DOMElement *createElementNS(const XMLCh *namespaceURI,
+                                        const XMLCh *qualifiedName,
+                                        const XMLSize_t lineNum,
+                                        const XMLSize_t columnNum) = 0;
     //@}
 
 };

Modified: xerces/c/trunk/src/xercesc/dom/DOMDocumentTraversal.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMDocumentTraversal.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMDocumentTraversal.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMDocumentTraversal.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.
@@ -23,12 +23,12 @@
 #define XERCESC_INCLUDE_GUARD_DOMDOCUMENTTRAVERSAL_HPP
 
 #include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/dom/DOMNodeFilter.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
 
 class DOMNode;
-class DOMNodeFilter;
 class DOMNodeIterator;
 class DOMTreeWalker;
 
@@ -51,7 +51,7 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
     DOMDocumentTraversal() {};
     //@}
 
@@ -107,10 +107,10 @@
      * @since DOM Level 2
      */
 
-    virtual DOMNodeIterator *createNodeIterator(DOMNode         *root,
-                                                   unsigned long    whatToShow,
-                                                   DOMNodeFilter* filter,
-                                                   bool             entityReferenceExpansion) = 0;
+    virtual DOMNodeIterator *createNodeIterator(DOMNode* root,
+                                                DOMNodeFilter::ShowType whatToShow,
+                                                DOMNodeFilter* filter,
+                                                bool entityReferenceExpansion) = 0;
     /**
      * Creates a TreeWalker object.   (DOM2)
      *
@@ -141,10 +141,10 @@
      * @since DOM Level 2
      */
 
-    virtual DOMTreeWalker  *createTreeWalker(DOMNode        *root,
-                                               unsigned long     whatToShow,
-                                               DOMNodeFilter  *filter,
-                                               bool              entityReferenceExpansion) = 0;
+    virtual DOMTreeWalker  *createTreeWalker(DOMNode* root,
+                                             DOMNodeFilter::ShowType whatToShow,
+                                             DOMNodeFilter* filter,
+                                             bool entityReferenceExpansion) = 0;
 
     //@}
 };

Modified: xerces/c/trunk/src/xercesc/dom/DOMError.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMError.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMError.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMError.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.
@@ -43,7 +43,7 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
     DOMError() {};
     //@}
 
@@ -79,19 +79,19 @@
      * The severity of the error described by the <code>DOMError</code>.
      *
      * <p><code>DOM_SEVERITY_ERROR:</code>
-     * The severity of the error described by the <code>DOMError</code> is error. 
-     * A DOM_SEVERITY_ERROR may not cause the processing to stop if the error can 
+     * The severity of the error described by the <code>DOMError</code> is error.
+     * A DOM_SEVERITY_ERROR may not cause the processing to stop if the error can
      * be recovered, unless <code>DOMErrorHandler::handleError()</code> returns false.</p>
      *
      * <p><code>DOM_SEVERITY_FATAL_ERROR</code>
-     * The severity of the error described by the <code>DOMError</code> is fatal error. 
-     * A DOM_SEVERITY_FATAL_ERROR will cause the normal processing to stop. The return 
-     * value of <code>DOMErrorHandler::handleError()</code> is ignored unless the 
+     * The severity of the error described by the <code>DOMError</code> is fatal error.
+     * A DOM_SEVERITY_FATAL_ERROR will cause the normal processing to stop. The return
+     * value of <code>DOMErrorHandler::handleError()</code> is ignored unless the
      * implementation chooses to continue, in which case the behavior becomes undefined.</p>
      *
      * <p><code>DOM_SEVERITY_WARNING</code>
-     * The severity of the error described by the <code>DOMError</code> is warning. 
-     * A DOM_SEVERITY_WARNING will not cause the processing to stop, unless 
+     * The severity of the error described by the <code>DOMError</code> is warning.
+     * A DOM_SEVERITY_WARNING will not cause the processing to stop, unless
      * <code>DOMErrorHandler::handleError()</code> returns false.</p>
      *
      * @since DOM Level 3
@@ -119,7 +119,7 @@
      * @see   setSeverity
      * @since DOM Level 3
      */
-    virtual short getSeverity() const = 0;
+    virtual ErrorSeverity getSeverity() const = 0;
 
     /**
      * Get the message describing the error that occured.
@@ -143,15 +143,15 @@
     virtual void* getRelatedException() const = 0;
 
     /**
-     * A <code>XMLCh*</code> indicating which related data is expected in 
+     * A <code>XMLCh*</code> indicating which related data is expected in
      * relatedData. Users should refer to the specification of the error
      * in order to find its <code>XMLCh*</code> type and relatedData
      * definitions if any.
      *
-     * Note: As an example, <code>DOMDocument::normalizeDocument()</code> does generate 
-     * warnings when the "split-cdata-sections" parameter is in use. Therefore, the 
-     * method generates a DOM_SEVERITY_WARNING with type "cdata-sections-splitted" 
-     * and the first <code>DOMCDATASection</code> node in document order resulting from the split 
+     * Note: As an example, <code>DOMDocument::normalizeDocument()</code> does generate
+     * warnings when the "split-cdata-sections" parameter is in use. Therefore, the
+     * method generates a DOM_SEVERITY_WARNING with type "cdata-sections-splitted"
+     * and the first <code>DOMCDATASection</code> node in document order resulting from the split
      * is returned by the relatedData attribute.
      *
      * @since DOM Level 3

Modified: xerces/c/trunk/src/xercesc/dom/DOMException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMException.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMException.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMException.cpp Thu Jun 26 06:29:21 2008
@@ -40,17 +40,17 @@
 }
 
 DOMException::DOMException()
-:code((ExceptionCode) 0)
+:code(0)
 ,msg(0)
 ,fMemoryManager(0)
 ,fMsgOwned(false)
 {
 }
 
-DOMException::DOMException(      short                 exCode
-                         ,       short                 messageCode
-                         ,       MemoryManager* const  memoryManager)
-:code((ExceptionCode) exCode)
+DOMException::DOMException(short exCode,
+                           short messageCode,
+                           MemoryManager* const  memoryManager)
+:code(exCode)
 ,fMemoryManager(0)
 ,fMsgOwned(true)
 {
@@ -82,4 +82,3 @@
 }
 
 XERCES_CPP_NAMESPACE_END
-

Modified: xerces/c/trunk/src/xercesc/dom/DOMException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMException.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMException.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMException.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.
@@ -52,52 +52,6 @@
 class CDOM_EXPORT DOMException  {
 public:
     // -----------------------------------------------------------------------
-    //  Constructors
-    // -----------------------------------------------------------------------
-    /** @name Constructors */
-    //@{
-    /**
-      * Default constructor for DOMException.
-      *
-      */
-    DOMException();
-
-    /**
-      * Constructor which takes an error code and an optional message code.
-      *
-      * @param code           The error code which indicates the exception
-      * @param messageCode    The string containing the error message
-      * @param memoryManager  The memory manager used to (de)allocate memory
-      */
-    DOMException(
-                       short                 code
-               ,       short                 messageCode = 0
-               ,       MemoryManager* const  memoryManager = XMLPlatformUtils::fgMemoryManager
-                );
-
-    /**
-      * Copy constructor.
-      *
-      * @param other The object to be copied.
-      */
-    DOMException(const DOMException &other);
-
-    //@}
-
-    // -----------------------------------------------------------------------
-    //  Destructors
-    // -----------------------------------------------------------------------
-    /** @name Destructor. */
-    //@{
-	 /**
-	  * Destructor for DOMException.
-	  *
-	  */
-    virtual ~DOMException();
-    //@}
-
-public:
-    // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
     /** @name Public Contants */
@@ -174,7 +128,7 @@
      * and the operation would not be done.
      *
      * <p><code>TYPE_MISMATCH_ERR:</code>
-     * If the type of an object is incompatible with the expected type of 
+     * If the type of an object is incompatible with the expected type of
      * the parameter associated to the object, this exception would be raised.
      *
      * The above is since DOM Level 3
@@ -201,6 +155,52 @@
         };
     //@}
 
+public:
+    // -----------------------------------------------------------------------
+    //  Constructors
+    // -----------------------------------------------------------------------
+    /** @name Constructors */
+    //@{
+    /**
+      * Default constructor for DOMException.
+      *
+      */
+    DOMException();
+
+    /**
+      * Constructor which takes an error code and an optional message code.
+      *
+      * @param code           The error code which indicates the exception
+      * @param messageCode    The string containing the error message
+      * @param memoryManager  The memory manager used to (de)allocate memory
+      */
+    DOMException(short code,
+                 short messageCode = 0,
+                 MemoryManager* const  memoryManager = XMLPlatformUtils::fgMemoryManager);
+
+    /**
+      * Copy constructor.
+      *
+      * @param other The object to be copied.
+      */
+    DOMException(const DOMException &other);
+
+    //@}
+
+    // -----------------------------------------------------------------------
+    //  Destructors
+    // -----------------------------------------------------------------------
+    /** @name Destructor. */
+    //@{
+	 /**
+	  * Destructor for DOMException.
+	  *
+	  */
+    virtual ~DOMException();
+    //@}
+
+
+public:
     // -----------------------------------------------------------------------
     //  Getter
     // -----------------------------------------------------------------------
@@ -211,40 +211,39 @@
     // -----------------------------------------------------------------------
     /** @name Public variables */
     //@{
-	 /**
-	  * A code value, from the set defined by the ExceptionCode enum,
+    /**
+     * A code value, from the set defined by the ExceptionCode enum,
      * indicating the type of error that occured.
      */
-    ExceptionCode   code;
+    short   code;
 
-	 /**
-	  * A string value.  Applications may use this field to hold an error
+    /**
+     * A string value.  Applications may use this field to hold an error
      *  message.  The field value is not set by the DOM implementation,
      *  meaning that the string will be empty when an exception is first
      *  thrown.
-	  */
+     */
     const XMLCh *msg;
     //@}
 
 protected:
-
     MemoryManager*  fMemoryManager;
 
 private:
 
-	 /**
-	  * A boolean value.  
-      *   If the message is provided by the applications, it is not 
+     /**
+      * A boolean value.
+      *   If the message is provided by the applications, it is not
       *   adopted.
       *   If the message is resolved by the DOM implementation, it is
       *   owned.
-	  */
+      */
     bool            fMsgOwned;
 
 private:
     // -----------------------------------------------------------------------
     // Unimplemented constructors and operators
-    // -----------------------------------------------------------------------    
+    // -----------------------------------------------------------------------
     DOMException & operator = (const DOMException &);
 };
 
@@ -256,4 +255,3 @@
 XERCES_CPP_NAMESPACE_END
 
 #endif
-

Modified: xerces/c/trunk/src/xercesc/dom/DOMImplementation.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMImplementation.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMImplementation.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMImplementation.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,7 +47,7 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
         DOMImplementation() {};                                      // no plain constructor
     //@}
 
@@ -183,18 +183,18 @@
     /** @name Functions introduced in DOM Level 3 */
     //@{
     /**
-     * This method returns a specialized object which implements the specialized APIs 
+     * This method returns a specialized object which implements the specialized APIs
      * of the specified feature and version, as specified in DOM Features.
-     * This method also allow the implementation to provide specialized objects which 
+     * This method also allow the implementation to provide specialized objects which
      * do not support the <code>DOMImplementation</code> interface.
      *
      * @param feature The name of the feature requested (case-insensitive).
-     *        Note that any plus sign "+" prepended to the name of the feature will 
+     *        Note that any plus sign "+" prepended to the name of the feature will
      *        be ignored since it is not significant in the context of this method.
      * @param version This is the version number of the feature to test.
-     * @return Returns an object which implements the specialized APIs of the specified 
-     *         feature and version, if any, or null if there is no object which implements 
-     *         interfaces associated with that feature. 
+     * @return Returns an object which implements the specialized APIs of the specified
+     *         feature and version, if any, or null if there is no object which implements
+     *         interfaces associated with that feature.
      * @since DOM Level 3
      */
     virtual void* getFeature(const XMLCh* feature, const XMLCh* version) const = 0;
@@ -235,46 +235,11 @@
      */
     static bool loadDOMExceptionMsg
     (
-        const   DOMException::ExceptionCode  msgToLoad
+          const   short  msgToLoad
         ,       XMLCh* const                 toFill
         , const XMLSize_t                    maxChars
     );
 
-    /**
-     * Non-standard extension
-     *
-     * Load the default error text message for DOMLSException.
-     * @param msgToLoad The DOM LSExceptionCode id to be processed
-     * @param toFill    The buffer that will hold the output on return. The
-     *         size of this buffer should at least be 'maxChars + 1'.
-     * @param maxChars  The maximum number of output characters that can be
-     *         accepted. If the result will not fit, it is an error.
-     * @return <code>true</code> if the message is successfully loaded
-     */
-    static bool loadDOMExceptionMsg
-    (
-        const   DOMLSException::LSExceptionCode msgToLoad
-        ,       XMLCh* const                    toFill
-        , const XMLSize_t                       maxChars
-    );
-
-    /**
-     * Non-standard extension
-     *
-     * Load the default error text message for DOMRangeException.
-     * @param msgToLoad The DOM RangeExceptionCode id to be processed
-     * @param toFill    The buffer that will hold the output on return. The
-     *         size of this buffer should at least be 'maxChars + 1'.
-     * @param maxChars  The maximum number of output characters that can be
-     *         accepted. If the result will not fit, it is an error.
-     * @return <code>true</code> if the message is successfully loaded
-     */
-    static bool loadDOMExceptionMsg
-    (
-        const   DOMRangeException::RangeExceptionCode  msgToLoad
-        ,       XMLCh* const                           toFill
-        , const XMLSize_t                              maxChars
-    );
     //@}
 
 };

Modified: xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMImplementationLS.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 */
-    //@{    
+    //@{
     DOMImplementationLS() {};
     //@}
 
@@ -87,7 +87,7 @@
     //@{
     /**
      * Create a synchronous or an asynchronous <code>DOMLSParser</code>.
-     * @see createLSParser(const unsigned short mode, const XMLCh* const schemaType)
+     * @see createLSParser(const DOMImplementationLSMode mode, const XMLCh* const schemaType)
      * @since DOM Level 3
      *
      */
@@ -107,25 +107,25 @@
     //  Factory create methods
     // -----------------------------------------------------------------------
     /**
-     * Create a new DOMLSParser. The newly constructed parser may then be configured 
-     * by means of its DOMConfiguration object, and used to parse documents by 
-     * means of its parse method. 
-     *
-     * @param mode      The mode argument is either <code>MODE_SYNCHRONOUS</code> 
-     * or <code>MODE_ASYNCHRONOUS</code>, if mode is <code>MODE_SYNCHRONOUS</code> 
-     * then the <code>DOMLSParser</code> that is created will operate in synchronous 
-     * mode, if it's <code>MODE_ASYNCHRONOUS</code> then the <code>DOMLSParser</code> 
+     * Create a new DOMLSParser. The newly constructed parser may then be configured
+     * by means of its DOMConfiguration object, and used to parse documents by
+     * means of its parse method.
+     *
+     * @param mode      The mode argument is either <code>MODE_SYNCHRONOUS</code>
+     * or <code>MODE_ASYNCHRONOUS</code>, if mode is <code>MODE_SYNCHRONOUS</code>
+     * then the <code>DOMLSParser</code> that is created will operate in synchronous
+     * mode, if it's <code>MODE_ASYNCHRONOUS</code> then the <code>DOMLSParser</code>
      * that is created will operate in asynchronous mode.
-     * @param schemaType An absolute URI representing the type of the schema 
-     * language used during the load of a <code>DOMDocument</code> using the newly 
-     * created <code>DOMLSParser</code>. Note that no lexical checking is done on 
-     * the absolute URI. In order to create a <code>DOMLSParser</code> for any kind 
-     * of schema types (i.e. the <code>DOMLSParser</code> will be free to use any 
-     * schema found), use the value <code>NULL</code>. 
-     * <b>Note</b>: For W3C XML Schema [XML Schema Part 1], applications must use 
-     * the value "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0], 
-     * applications must use the value "http://www.w3.org/TR/REC-xml". 
-     * Other Schema languages are outside the scope of the W3C and therefore should 
+     * @param schemaType An absolute URI representing the type of the schema
+     * language used during the load of a <code>DOMDocument</code> using the newly
+     * created <code>DOMLSParser</code>. Note that no lexical checking is done on
+     * the absolute URI. In order to create a <code>DOMLSParser</code> for any kind
+     * of schema types (i.e. the <code>DOMLSParser</code> will be free to use any
+     * schema found), use the value <code>NULL</code>.
+     * <b>Note</b>: For W3C XML Schema [XML Schema Part 1], applications must use
+     * the value "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0],
+     * applications must use the value "http://www.w3.org/TR/REC-xml".
+     * Other Schema languages are outside the scope of the W3C and therefore should
      * recommend an absolute URI in order to use this method.
      * @param manager    Pointer to the memory manager to be used to allocate objects.
      * @param gramPool   The collection of cached grammers.
@@ -138,7 +138,7 @@
      * @see DOMLSParser
      * @since DOM Level 3
      */
-    virtual DOMLSParser* createLSParser(const unsigned short   mode,
+    virtual DOMLSParser* createLSParser(const DOMImplementationLSMode mode,
                                         const XMLCh* const     schemaType,
                                         MemoryManager* const   manager = XMLPlatformUtils::fgMemoryManager,
                                         XMLGrammarPool*  const gramPool = 0) = 0;

Modified: xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMImplementationList.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMImplementationList.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.
@@ -32,8 +32,8 @@
 
 /**
  * The <code>DOMImplementationList</code> interface provides the abstraction of an ordered
- * collection of DOM implementations, without defining or constraining how this collection 
- * is implemented. The items in the <code>DOMImplementationList</code> are accessible via 
+ * collection of DOM implementations, without defining or constraining how this collection
+ * is implemented. The items in the <code>DOMImplementationList</code> are accessible via
  * an integral index, starting from 0.
  */
 
@@ -43,7 +43,7 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
     DOMImplementationList() {};
     //@}
 
@@ -90,7 +90,7 @@
      *   index.
      * @since DOM Level 3
      */
-    virtual DOMImplementation *item(unsigned int index) const = 0;
+    virtual DOMImplementation *item(XMLSize_t index) const = 0;
 
     /**
      * Returns the number of DOMImplementation in the list.
@@ -98,7 +98,7 @@
      * The range of valid child node indices is 0 to <code>length-1</code> inclusive.
      * @since DOM Level 3
      */
-    virtual unsigned int getLength() const = 0;
+    virtual XMLSize_t getLength() const = 0;
     //@}
 
     // -----------------------------------------------------------------------
@@ -115,12 +115,10 @@
      *
      */
     virtual void release() = 0;
-    //@}     
+    //@}
 
 };
 
 XERCES_CPP_NAMESPACE_END
 
 #endif
-
-

Modified: xerces/c/trunk/src/xercesc/dom/DOMLSException.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLSException.cpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLSException.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLSException.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.
@@ -26,14 +26,14 @@
 
 DOMLSException::DOMLSException()
 : DOMException()
-{      
+{
 }
 
-DOMLSException::DOMLSException(    LSExceptionCode              exCode
-                                 ,       short                  messageCode
-                                 ,       MemoryManager* const   memoryManager)
+DOMLSException::DOMLSException(short exCode,
+                               short messageCode,
+                               MemoryManager* const   memoryManager)
 : DOMException(exCode, messageCode?messageCode:XMLDOMMsg::DOMLSEXCEPTION_ERRX+exCode-DOMLSException::PARSE_ERR+1, memoryManager)
-{  
+{
 }
 
 DOMLSException::DOMLSException(const DOMLSException &other)
@@ -47,4 +47,3 @@
 }
 
 XERCES_CPP_NAMESPACE_END
-

Modified: xerces/c/trunk/src/xercesc/dom/DOMLSException.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLSException.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLSException.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLSException.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.
@@ -28,12 +28,12 @@
 
 
 /**
- * Parser or write operations may throw an LSException if the processing is stopped. 
- * The processing can be stopped due to a <code>DOMError</code> with a severity of 
- * DOMError::DOM_SEVERITY_FATAL_ERROR or a non recovered DOMError::DOM_SEVERITY_ERROR, 
+ * Parser or write operations may throw an LSException if the processing is stopped.
+ * The processing can be stopped due to a <code>DOMError</code> with a severity of
+ * DOMError::DOM_SEVERITY_FATAL_ERROR or a non recovered DOMError::DOM_SEVERITY_ERROR,
  * or if <code>DOMErrorHandler::handleError()</code> returned <code>false</code>.
  * <p><b>Note</b>: As suggested in the definition of the constants in the <code>DOMError</code>
- * interface, a DOM implementation may choose to continue after a fatal error, but the 
+ * interface, a DOM implementation may choose to continue after a fatal error, but the
  * resulting DOM tree is then implementation dependent.
  * <p>See also the <a href='http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/DOM3-LS.html'>
  * Document Object Model (DOM) Level 3 Load and Save Specification</a>.
@@ -53,11 +53,11 @@
      * ExceptionCode
      *
      * <p><code>PARSE_ERR:</code>
-     * If an attempt was made to load a document, or an XML Fragment, using DOMLSParser 
+     * If an attempt was made to load a document, or an XML Fragment, using DOMLSParser
      * and the processing has been stopped.</p>
      *
      * <p><code>SERIALIZE_ERR:</code>
-     * If an attempt was made to serialize a Node using LSSerializer and the processing 
+     * If an attempt was made to serialize a Node using LSSerializer and the processing
      * has been stopped.</p>
      *
      * @since DOM Level 3
@@ -86,9 +86,9 @@
       * @param messageCode    The string containing the error message
       * @param memoryManager  The memory manager used to (de)allocate memory
       */
-    DOMLSException(    LSExceptionCode              code
-                     ,       short                  messageCode
-                     ,       MemoryManager* const   memoryManager);
+    DOMLSException(short code,
+                   short messageCode,
+                   MemoryManager* const memoryManager);
 
     /**
       * Copy constructor.
@@ -114,11 +114,10 @@
 private:
     // -----------------------------------------------------------------------
     // Unimplemented constructors and operators
-    // -----------------------------------------------------------------------    
+    // -----------------------------------------------------------------------
     DOMLSException & operator = (const DOMLSException &);
 };
 
 XERCES_CPP_NAMESPACE_END
 
 #endif
-

Modified: xerces/c/trunk/src/xercesc/dom/DOMLSParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/DOMLSParser.hpp?rev=671894&r1=671893&r2=671894&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/DOMLSParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/DOMLSParser.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.
@@ -23,8 +23,9 @@
 #if !defined(XERCESC_INCLUDE_GUARD_DOMLSPARSER_HPP)
 #define XERCESC_INCLUDE_GUARD_DOMLSPARSER_HPP
 
-#include <xercesc/util/XercesDefs.hpp>
 #include <xercesc/dom/DOMConfiguration.hpp>
+#include <xercesc/util/XercesDefs.hpp>
+#include <xercesc/validators/common/Grammar.hpp>
 
 XERCES_CPP_NAMESPACE_BEGIN
 
@@ -34,7 +35,6 @@
 class DOMLSParserFilter;
 class DOMNode;
 class DOMDocument;
-class Grammar;
 
 /**
  * DOMLSParser provides an API for parsing XML documents and building the
@@ -51,11 +51,11 @@
     //  Hidden constructors
     // -----------------------------------------------------------------------
     /** @name Hidden constructors */
-    //@{    
+    //@{
     DOMLSParser() {};
     //@}
 
-private:    
+private:
     // -----------------------------------------------------------------------
     // Unimplemented constructors and operators
     // -----------------------------------------------------------------------
@@ -87,28 +87,28 @@
      * A set of possible actions for the parseWithContext method.
      *
      * <p><code>ACTION_APPEND_AS_CHILDREN</code>:
-     * Append the result of the parse operation as children of the context node. 
-     * For this action to work, the context node must be a <code>DOMElement</code> 
+     * Append the result of the parse operation as children of the context node.
+     * For this action to work, the context node must be a <code>DOMElement</code>
      * or a <code>DOMDocumentFragment</code>. </p>
      *
      * <p><code>ACTION_INSERT_AFTER</code>:
-     * Insert the result of the parse operation as the immediately following sibling 
-     * of the context node. For this action to work the context node's parent must 
+     * Insert the result of the parse operation as the immediately following sibling
+     * of the context node. For this action to work the context node's parent must
      * be a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
      *
      * <p><code>ACTION_INSERT_BEFORE</code>:
-     * Insert the result of the parse operation as the immediately preceding sibling 
-     * of the context node. For this action to work the context node's parent must 
+     * Insert the result of the parse operation as the immediately preceding sibling
+     * of the context node. For this action to work the context node's parent must
      * be a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
      *
      * <p><code>ACTION_REPLACE</code>:
-     * Replace the context node with the result of the parse operation. For this 
-     * action to work, the context node must have a parent, and the parent must be 
+     * Replace the context node with the result of the parse operation. For this
+     * action to work, the context node must have a parent, and the parent must be
      * a <code>DOMElement</code> or a <code>DOMDocumentFragment</code>. </p>
      *
      * <p><code>ACTION_REPLACE_CHILDREN</code>:
-     * Replace all the children of the context node with the result of the parse 
-     * operation. For this action to work, the context node must be a <code>DOMElement</code>, 
+     * Replace all the children of the context node with the result of the parse
+     * operation. For this action to work, the context node must be a <code>DOMElement</code>,
      * a <code>DOMDocument</code>, or a <code>DOMDocumentFragment</code>. </p>
      *
      * @see parseWithContext(...)
@@ -135,99 +135,99 @@
     // -----------------------------------------------------------------------
 
     /**
-      * Get a pointer to the <code>DOMConfiguration</code> object used when parsing 
-      * an input source. 
-      * This <code>DOMConfiguration</code> is specific to the parse operation. 
-      * No parameter values from this <code>DOMConfiguration</code> object are passed 
-      * automatically to the <code>DOMConfiguration</code> object on the 
-      * <code>DOMDocument</code> that is created, or used, by the parse operation. 
-      * The DOM application is responsible for passing any needed parameter values 
-      * from this <code>DOMConfiguration</code> object to the <code>DOMConfiguration</code> 
+      * Get a pointer to the <code>DOMConfiguration</code> object used when parsing
+      * an input source.
+      * This <code>DOMConfiguration</code> is specific to the parse operation.
+      * No parameter values from this <code>DOMConfiguration</code> object are passed
+      * automatically to the <code>DOMConfiguration</code> object on the
+      * <code>DOMDocument</code> that is created, or used, by the parse operation.
+      * The DOM application is responsible for passing any needed parameter values
+      * from this <code>DOMConfiguration</code> object to the <code>DOMConfiguration</code>
       * object referenced by the <code>DOMDocument</code> object.
       *
       * In addition to the parameters recognized in on the <code>DOMConfiguration</code>
-      * interface defined in [DOM Level 3 Core], the <code>DOMConfiguration</code> objects 
-      * for <code>DOMLSParser</code> add or modify the following parameters: 
+      * interface defined in [DOM Level 3 Core], the <code>DOMConfiguration</code> objects
+      * for <code>DOMLSParser</code> add or modify the following parameters:
       *
-      * "charset-overrides-xml-encoding" 
+      * "charset-overrides-xml-encoding"
       *     true [optional] (default)
-      *         If a higher level protocol such as HTTP [IETF RFC 2616] provides an 
-      *         indication of the character encoding of the input stream being processed, 
-      *         that will override any encoding specified in the XML declaration or the 
-      *         Text declaration (see also section 4.3.3, "Character Encoding in Entities", 
+      *         If a higher level protocol such as HTTP [IETF RFC 2616] provides an
+      *         indication of the character encoding of the input stream being processed,
+      *         that will override any encoding specified in the XML declaration or the
+      *         Text declaration (see also section 4.3.3, "Character Encoding in Entities",
       *         in [XML 1.0]). Explicitly setting an encoding in the <code>DOMLSInput</code>
-      *          overrides any encoding from the protocol. 
+      *          overrides any encoding from the protocol.
       *     false [required]
-      *         The parser ignores any character set encoding information from higher-level 
-      *         protocols. 
+      *         The parser ignores any character set encoding information from higher-level
+      *         protocols.
       *
-      * "disallow-doctype" 
+      * "disallow-doctype"
       *     true [optional]
-      *         Throw a fatal "doctype-not-allowed" error if a doctype node is found while 
-      *         parsing the document. This is useful when dealing with things like SOAP 
-      *         envelopes where doctype nodes are not allowed. 
+      *         Throw a fatal "doctype-not-allowed" error if a doctype node is found while
+      *         parsing the document. This is useful when dealing with things like SOAP
+      *         envelopes where doctype nodes are not allowed.
       *     false [required] (default)
-      *         Allow doctype nodes in the document. 
+      *         Allow doctype nodes in the document.
       *
-      * "ignore-unknown-character-denormalizations" 
+      * "ignore-unknown-character-denormalizations"
       *     true [required] (default)
-      *         If, while verifying full normalization when [XML 1.1] is supported, a 
-      *         processor encounters characters for which it cannot determine the normalization 
-      *         properties, then the processor will ignore any possible denormalizations 
+      *         If, while verifying full normalization when [XML 1.1] is supported, a
+      *         processor encounters characters for which it cannot determine the normalization
+      *         properties, then the processor will ignore any possible denormalizations
       *         caused by these characters.
-      *         This parameter is ignored for [XML 1.0]. 
+      *         This parameter is ignored for [XML 1.0].
       *     false [optional]
-      *         Report an fatal "unknown-character-denormalization" error if a character 
-      *         is encountered for which the processor cannot determine the normalization 
-      *         properties. 
-      *
-      * "infoset" 
-      *     See the definition of DOMConfiguration for a description of this parameter. 
-      *     Unlike in [DOM Level 3 Core], this parameter will default to true for DOMLSParser. 
+      *         Report an fatal "unknown-character-denormalization" error if a character
+      *         is encountered for which the processor cannot determine the normalization
+      *         properties.
+      *
+      * "infoset"
+      *     See the definition of DOMConfiguration for a description of this parameter.
+      *     Unlike in [DOM Level 3 Core], this parameter will default to true for DOMLSParser.
       *
-      * "namespaces" 
+      * "namespaces"
       *     true [required] (default)
-      *         Perform the namespace processing as defined in [XML Namespaces] and 
-      *         [XML Namespaces 1.1]. 
+      *         Perform the namespace processing as defined in [XML Namespaces] and
+      *         [XML Namespaces 1.1].
       *     false [optional]
-      *         Do not perform the namespace processing. 
+      *         Do not perform the namespace processing.
       *
       * "resource-resolver" [required]
-      *     A pointer to a DOMLSResourceResolver object, or NULL. If the value of this parameter 
-      *     is not null when an external resource (such as an external XML entity or an XML schema 
-      *     location) is encountered, the implementation will request that the DOMLSResourceResolver 
-      *     referenced in this parameter resolves the resource. 
+      *     A pointer to a DOMLSResourceResolver object, or NULL. If the value of this parameter
+      *     is not null when an external resource (such as an external XML entity or an XML schema
+      *     location) is encountered, the implementation will request that the DOMLSResourceResolver
+      *     referenced in this parameter resolves the resource.
       *
-      * "supported-media-types-only" 
+      * "supported-media-types-only"
       *     true [optional]
-      *         Check that the media type of the parsed resource is a supported media type. If 
-      *         an unsupported media type is encountered, a fatal error of type "unsupported-media-type" 
-      *         will be raised. The media types defined in [IETF RFC 3023] must always be accepted. 
+      *         Check that the media type of the parsed resource is a supported media type. If
+      *         an unsupported media type is encountered, a fatal error of type "unsupported-media-type"
+      *         will be raised. The media types defined in [IETF RFC 3023] must always be accepted.
       *     false [required] (default)
-      *         Accept any media type. 
+      *         Accept any media type.
       *
-      * "validate" 
-      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter. 
-      *     Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even 
-      *     if this parameter is set to false. 
-      *
-      * "validate-if-schema" 
-      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter. 
-      *     Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even 
-      *     if this parameter is set to false. 
-      *
-      * "well-formed" 
-      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter. 
-      *     Unlike in [DOM Level 3 Core], this parameter cannot be set to false. 
+      * "validate"
+      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+      *     Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even
+      *     if this parameter is set to false.
+      *
+      * "validate-if-schema"
+      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+      *     Unlike in [DOM Level 3 Core], the processing of the internal subset is always accomplished, even
+      *     if this parameter is set to false.
+      *
+      * "well-formed"
+      *     See the definition of <code>DOMConfiguration</code> for a description of this parameter.
+      *     Unlike in [DOM Level 3 Core], this parameter cannot be set to false.
       *
       * In addition to these, Xerces adds these non standard parameters:
-      * 
+      *
       * "http://apache.org/xml/properties/entity-resolver"
-      *     A pointer to a XMLEntityResolver object, or NULL. If the value of this parameter 
-      *     is not null when an external resource (such as an external XML entity or an XML schema 
+      *     A pointer to a XMLEntityResolver object, or NULL. If the value of this parameter
+      *     is not null when an external resource (such as an external XML entity or an XML schema
       *     location) is encountered, the implementation will request that the XMLEntityResolver
-      *     referenced in this parameter resolves the resource. 
-      * 
+      *     referenced in this parameter resolves the resource.
+      *
       * "http://apache.org/xml/properties/schema/external-schemaLocation"
       *     A string holding a set of [namespaceUri schemaLocation] entries that will be treated as
       *     the content of the attribute xsi:schemaLocation of the root element
@@ -254,13 +254,13 @@
       *     resulting from the parse operation. For instance, "LS" or "Core"
       *
       * "http://apache.org/xml/features/validation/schema"
-      *     true 
+      *     true
       *         Enable XMLSchema validation (note that also namespace processing should be enabled)
       *     false (default)
       *         Don't perform XMLSchema validation
       *
       * "http://apache.org/xml/features/validation/schema-full-checking"
-      *     true 
+      *     true
       *         Turn on full XMLSchema checking (e.g. Unique Particle Attribution)
       *     false (default)
       *         Don't perform full XMLSchema checking
@@ -272,7 +272,7 @@
       *         Schemas that are not in the grammar pool are ignored
       *
       * "http://apache.org/xml/features/dom/user-adopts-DOMDocument"
-      *     true 
+      *     true
       *         The DOMDocument objects returned by <code>parse</code> will be owned by the caller
       *     false (default)
       *         The DOMDocument objects returned by <code>parse</code> will be owned by this <code>DOMLSParser</code>
@@ -282,7 +282,7 @@
       *     true (default)
       *         Allow the parser to load external DTDs
       *     false
-      *         References to external DTDs will be ignored 
+      *         References to external DTDs will be ignored
       *
       * "http://apache.org/xml/features/continue-after-fatal-error"
       *     true
@@ -297,7 +297,7 @@
       *         has been specified)
       *     false (default)
       *         Validation errors are normal errors
-      * 
+      *
       * "http://apache.org/xml/features/validation/cache-grammarFromParse"
       *     true
       *         XMLSchemas referenced by an XML file are cached in order to be reused by other parse operations
@@ -309,7 +309,7 @@
       *         During this parse operation, reuse the XMLSchemas found in the cache
       *     false (default)
       *         Don't reuse the XMLSchemas found in the cache
-      * 
+      *
       * "http://apache.org/xml/features/calculate-src-ofs"
       *     true
       *         During parsing update the position in the source stream
@@ -390,7 +390,7 @@
     /**
       * Return whether the parser is asynchronous
       *
-      * @return <code>true</code> if the <code>DOMLSParser</code> is asynchronous, 
+      * @return <code>true</code> if the <code>DOMLSParser</code> is asynchronous,
       *         <code>false</code> if it is synchronous
       * @since DOM Level 3
       */
@@ -399,7 +399,7 @@
     /**
       * Return whether the parser is busy parsing
       *
-      * @return <code>true</code> if the <code>DOMLSParser</code> is currently busy 
+      * @return <code>true</code> if the <code>DOMLSParser</code> is currently busy
       *         loading a document, otherwise <code>false</code>.
       * @since DOM Level 3
       */
@@ -412,11 +412,11 @@
       * Set the application filter
       *
       * When the application provides a filter, the parser will call out to
-      * the filter at the completion of the construction of each <code>DOMElement</code> 
+      * the filter at the completion of the construction of each <code>DOMElement</code>
       * node. The filter implementation can choose to remove the element from the
-      * document being constructed or to terminate the parse early. 
-      * The filter is invoked after the operations requested by the DOMConfiguration 
-      * parameters have been applied. For example, if "validate" is set to true, 
+      * document being constructed or to terminate the parse early.
+      * The filter is invoked after the operations requested by the DOMConfiguration
+      * parameters have been applied. For example, if "validate" is set to true,
       * the validation is done before invoking the filter.
       *
       * <i>Any previously set filter is merely dropped, since the parser
@@ -434,24 +434,24 @@
     //  Parsing methods
     // -----------------------------------------------------------------------
     /**
-      * Parse an XML document from a resource identified by a <code>DOMLSInput</code>. 
+      * Parse an XML document from a resource identified by a <code>DOMLSInput</code>.
       *
       * The parser owns the returned DOMDocument.  It will be deleted
       * when the parser is released.
       *
-      * @param source The <code>DOMLSInput</code> from which the source of the document 
+      * @param source The <code>DOMLSInput</code> from which the source of the document
       *               is to be read.
-      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code> 
-      *         the newly created and populated <code>DOMDocument</code> is returned. 
-      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code> 
-      *         is returned since the document object may not yet be constructed when 
+      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+      *         the newly created and populated <code>DOMDocument</code> is returned.
+      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
+      *         is returned since the document object may not yet be constructed when
       *         this method returns.
       * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
       *                                            attribute is true.
-      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable 
-      *                                      to load the XML document. DOM applications should 
-      *                                      attach a <code>DOMErrorHandler</code> using the 
-      *                                      parameter "error-handler" if they wish to get details 
+      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+      *                                      to load the XML document. DOM applications should
+      *                                      attach a <code>DOMErrorHandler</code> using the
+      *                                      parameter "error-handler" if they wish to get details
       *                                      on the error.
       *
       * @see DOMLSInput#DOMLSInput
@@ -462,25 +462,25 @@
     virtual DOMDocument* parse(const DOMLSInput* source) = 0;
 
     /**
-      * Parse an XML document from a location identified by a URI reference [IETF RFC 2396]. 
-      * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]), 
-      * the behavior is not defined by this specification, future versions of this 
-      * specification may define the behavior. 
+      * Parse an XML document from a location identified by a URI reference [IETF RFC 2396].
+      * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]),
+      * the behavior is not defined by this specification, future versions of this
+      * specification may define the behavior.
       *
       * The parser owns the returned DOMDocument.  It will be deleted
       * when the parser is released.
       *
       * @param uri The location of the XML document to be read (in Unicode)
-      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code> 
-      *         the newly created and populated <code>DOMDocument</code> is returned. 
-      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code> 
+      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+      *         the newly created and populated <code>DOMDocument</code> is returned.
+      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
       *         is returned since the document object is not yet parsed when this method returns.
       * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
       *                                            attribute is true.
-      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable 
-      *                                      to load the XML document. DOM applications should 
-      *                                      attach a <code>DOMErrorHandler</code> using the 
-      *                                      parameter "error-handler" if they wish to get details 
+      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+      *                                      to load the XML document. DOM applications should
+      *                                      attach a <code>DOMErrorHandler</code> using the
+      *                                      parameter "error-handler" if they wish to get details
       *                                      on the error.
       *
       * @see #parse(DOMLSInput,...)
@@ -490,25 +490,25 @@
     virtual DOMDocument* parseURI(const XMLCh* const uri) = 0;
 
     /**
-      * Parse an XML document from a location identified by a URI reference [IETF RFC 2396]. 
-      * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]), 
-      * the behavior is not defined by this specification, future versions of this 
-      * specification may define the behavior. 
+      * Parse an XML document from a location identified by a URI reference [IETF RFC 2396].
+      * If the URI contains a fragment identifier (see section 4.1 in [IETF RFC 2396]),
+      * the behavior is not defined by this specification, future versions of this
+      * specification may define the behavior.
       *
       * The parser owns the returned DOMDocument.  It will be deleted
       * when the parser is released.
       *
       * @param uri The location of the XML document to be read (in the local code page)
-      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code> 
-      *         the newly created and populated <code>DOMDocument</code> is returned. 
-      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code> 
+      * @return If the <code>DOMLSParser</code> is a synchronous <code>DOMLSParser</code>
+      *         the newly created and populated <code>DOMDocument</code> is returned.
+      *         If the <code>DOMLSParser</code> is asynchronous then <code>NULL</code>
       *         is returned since the document object is not yet parsed when this method returns.
       * @exception DOMException INVALID_STATE_ERR: Raised if the <code>DOMLSParser::busy</code>
       *                                            attribute is true.
-      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable 
-      *                                      to load the XML document. DOM applications should 
-      *                                      attach a <code>DOMErrorHandler</code> using the 
-      *                                      parameter "error-handler" if they wish to get details 
+      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable
+      *                                      to load the XML document. DOM applications should
+      *                                      attach a <code>DOMErrorHandler</code> using the
+      *                                      parameter "error-handler" if they wish to get details
       *                                      on the error.
       *
       * @see #parse(DOMLSInput,...)
@@ -518,69 +518,69 @@
     virtual DOMDocument* parseURI(const char* const uri) = 0;
 
     /**
-      * Parse an XML fragment from a resource identified by a <code>DOMLSInput</code> 
-      * and insert the content into an existing document at the position specified 
-      * with the context and action arguments. When parsing the input stream, the 
-      * context node (or its parent, depending on where the result will be inserted) 
-      * is used for resolving unbound namespace prefixes. The context node's 
-      * <code>ownerDocument</code> node (or the node itself if the node of type 
-      * <code>DOCUMENT_NODE</code>) is used to resolve default attributes and entity 
+      * Parse an XML fragment from a resource identified by a <code>DOMLSInput</code>
+      * and insert the content into an existing document at the position specified
+      * with the context and action arguments. When parsing the input stream, the
+      * context node (or its parent, depending on where the result will be inserted)
+      * is used for resolving unbound namespace prefixes. The context node's
+      * <code>ownerDocument</code> node (or the node itself if the node of type
+      * <code>DOCUMENT_NODE</code>) is used to resolve default attributes and entity
       * references.
-      * As the new data is inserted into the document, at least one mutation event 
+      * As the new data is inserted into the document, at least one mutation event
       * is fired per new immediate child or sibling of the context node.
-      * If the context node is a <code>DOMDocument</code> node and the action is 
-      * <code>ACTION_REPLACE_CHILDREN</code>, then the document that is passed as 
-      * the context node will be changed such that its <code>xmlEncoding</code>, 
-      * <code>documentURI</code>, <code>xmlVersion</code>, <code>inputEncoding</code>, 
-      * <code>xmlStandalone</code>, and all other such attributes are set to what they 
+      * If the context node is a <code>DOMDocument</code> node and the action is
+      * <code>ACTION_REPLACE_CHILDREN</code>, then the document that is passed as
+      * the context node will be changed such that its <code>xmlEncoding</code>,
+      * <code>documentURI</code>, <code>xmlVersion</code>, <code>inputEncoding</code>,
+      * <code>xmlStandalone</code>, and all other such attributes are set to what they
       * would be set to if the input source was parsed using <code>DOMLSParser::parse()</code>.
-      * This method is always synchronous, even if the <code>DOMLSParser</code> is 
+      * This method is always synchronous, even if the <code>DOMLSParser</code> is
       * asynchronous (<code>DOMLSParser::getAsync()</code> returns true).
-      * If an error occurs while parsing, the caller is notified through the <code>ErrorHandler</code> 
+      * If an error occurs while parsing, the caller is notified through the <code>ErrorHandler</code>
       * instance associated with the "error-handler" parameter of the <code>DOMConfiguration</code>.
-      * When calling <code>parseWithContext</code>, the values of the following configuration 
-      * parameters will be ignored and their default values will always be used instead: 
-      *   "validate", 
+      * When calling <code>parseWithContext</code>, the values of the following configuration
+      * parameters will be ignored and their default values will always be used instead:
+      *   "validate",
       *   "validate-if-schema"
-      *   "element-content-whitespace". 
-      * Other parameters will be treated normally, and the parser is expected to call 
-      * the <code>DOMLSParserFilter</code> just as if a whole document was parsed. 
-      *
-      * @param source The <code>DOMLSInput</code> from which the source document is 
-      *               to be read. The source document must be an XML fragment, i.e. 
-      *               anything except a complete XML document (except in the case where 
-      *               the context node of type <code>DOCUMENT_NODE</code>, and the action is 
-      *               <code>ACTION_REPLACE_CHILDREN</code>), a <code>DOCTYPE</code> 
-      *               (internal subset), entity declaration(s), notation declaration(s), 
+      *   "element-content-whitespace".
+      * Other parameters will be treated normally, and the parser is expected to call
+      * the <code>DOMLSParserFilter</code> just as if a whole document was parsed.
+      *
+      * @param source The <code>DOMLSInput</code> from which the source document is
+      *               to be read. The source document must be an XML fragment, i.e.
+      *               anything except a complete XML document (except in the case where
+      *               the context node of type <code>DOCUMENT_NODE</code>, and the action is
+      *               <code>ACTION_REPLACE_CHILDREN</code>), a <code>DOCTYPE</code>
+      *               (internal subset), entity declaration(s), notation declaration(s),
       *               or XML or text declaration(s).
-      * @param contextNode The node that is used as the context for the data that is being 
-      *                    parsed. This node must be a <code>DOMDocument</code> node, a 
-      *                    <code>DOMDocumentFragment</code> node, or a node of a type that 
-      *                    is allowed as a child of an <code>DOMElement</code> node, e.g. 
+      * @param contextNode The node that is used as the context for the data that is being
+      *                    parsed. This node must be a <code>DOMDocument</code> node, a
+      *                    <code>DOMDocumentFragment</code> node, or a node of a type that
+      *                    is allowed as a child of an <code>DOMElement</code> node, e.g.
       *                    it cannot be an <code>DOMAttribute</code> node.
-      * @param action This parameter describes which action should be taken between the new 
-      *               set of nodes being inserted and the existing children of the context node. 
+      * @param action This parameter describes which action should be taken between the new
+      *               set of nodes being inserted and the existing children of the context node.
       *               The set of possible actions is defined in <code>ACTION_TYPES</code> above.
-      * @return Return the node that is the result of the parse operation. If the result is more 
+      * @return Return the node that is the result of the parse operation. If the result is more
       *         than one top-level node, the first one is returned.
       *
       * @exception DOMException
-      *     HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be inserted before, after, 
-      *                            or as a child of the context node (see also <code>DOMNode::insertBefore</code> 
+      *     HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be inserted before, after,
+      *                            or as a child of the context node (see also <code>DOMNode::insertBefore</code>
       *                            or <code>DOMNode::replaceChild</code> in [DOM Level 3 Core]).
-      *     NOT_SUPPORTED_ERR: Raised if the <code>DOMLSParser</code> doesn't support this method, 
-      *                        or if the context node is of type <code>DOMDocument</code> and the DOM 
-      *                        implementation doesn't support the replacement of the <code>DOMDocumentType</code> 
+      *     NOT_SUPPORTED_ERR: Raised if the <code>DOMLSParser</code> doesn't support this method,
+      *                        or if the context node is of type <code>DOMDocument</code> and the DOM
+      *                        implementation doesn't support the replacement of the <code>DOMDocumentType</code>
       *                        child or <code>DOMElement</code> child.
-      *     NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a read only node and the content 
-      *                                  is being appended to its child list, or if the parent node of 
-      *                                  the context node is read only node and the content is being 
+      *     NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a read only node and the content
+      *                                  is being appended to its child list, or if the parent node of
+      *                                  the context node is read only node and the content is being
       *                                  inserted in its child list.
       *     INVALID_STATE_ERR: Raised if the <code>DOMLSParser::getBusy()</code> returns true.
       *
-      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable to load 
-      *                                      the XML fragment. DOM applications should attach a 
-      *                                      <code>DOMErrorHandler</code> using the parameter "error-handler" 
+      * @exception DOMLSException PARSE_ERR: Raised if the <code>DOMLSParser</code> was unable to load
+      *                                      the XML fragment. DOM applications should attach a
+      *                                      <code>DOMErrorHandler</code> using the parameter "error-handler"
       *                                      if they wish to get details on the error.
       * @since DOM Level 3
       */
@@ -588,12 +588,12 @@
     (
         const   DOMLSInput*     source
         ,       DOMNode*        contextNode
-        , const unsigned short  action
+        , const ActionType      action
     ) = 0;
 
     /**
-      * Abort the loading of the document that is currently being loaded by the <code>DOMLSParser</code>. 
-      * If the <code>DOMLSParser</code> is currently not busy, a call to this method does nothing. 
+      * Abort the loading of the document that is currently being loaded by the <code>DOMLSParser</code>.
+      * If the <code>DOMLSParser</code> is currently not busy, a call to this method does nothing.
       *
       * Note: invoking this method will remove the installed <code>DOMLSParserFilter</code> filter
       *
@@ -666,7 +666,7 @@
       * @see DOMLSInput#DOMLSInput
       */
     virtual Grammar* loadGrammar(const DOMLSInput* source,
-                                 const short grammarType,
+                                 const Grammar::GrammarType grammarType,
                                  const bool toCache = false) = 0;
 
     /**
@@ -693,7 +693,7 @@
       * @exception DOMException A DOM exception as per DOM spec.
       */
     virtual Grammar* loadGrammar(const XMLCh* const systemId,
-                                 const short grammarType,
+                                 const Grammar::GrammarType grammarType,
                                  const bool toCache = false) = 0;
 
     /**
@@ -720,7 +720,7 @@
       * @exception DOMException A DOM exception as per DOM spec.
       */
     virtual Grammar* loadGrammar(const char* const systemId,
-                                 const short grammarType,
+                                 const Grammar::GrammarType grammarType,
                                  const bool toCache = false) = 0;
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org