diff --git a/src/xercesc/dom/DOMDocument.hpp b/src/xercesc/dom/DOMDocument.hpp
index f66ad8ff4bb0ec952c6ed53c621df45aae48aa33..8aad798d00fe80c2e8515fb99558321d4cb55e68 100644
--- a/src/xercesc/dom/DOMDocument.hpp
+++ b/src/xercesc/dom/DOMDocument.hpp
@@ -809,6 +809,8 @@ public:
*/
virtual DOMConfiguration* getDOMConfiguration() const = 0;
+ //@}
+
// -----------------------------------------------------------------------
// Non-standard extension
// -----------------------------------------------------------------------
diff --git a/src/xercesc/dom/DOMNode.hpp b/src/xercesc/dom/DOMNode.hpp
index 2647ee6cd163fa9c7b28ef66db30e90b720adb23..85ec3e4aed055d933f3ceaf82c7d9487297f767c 100644
--- a/src/xercesc/dom/DOMNode.hpp
+++ b/src/xercesc/dom/DOMNode.hpp
@@ -60,43 +60,38 @@ class DOMUserDataHandler;
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMAttr</td>
- * <td valign='top' rowspan='1' colspan='1'>name of
- * attribute</td>
+ * <td valign='top' rowspan='1' colspan='1'>name of attribute</td>
* <td valign='top' rowspan='1' colspan='1'>value of attribute</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMCDATASection</td>
- * <td valign='top' rowspan='1' colspan='1'><code>"#cdata-section"</code></td>
- * <td valign='top' rowspan='1' colspan='1'>
- * content of the CDATA Section</td>
+ * <td valign='top' rowspan='1' colspan='1'>"#cdata-section"</td>
+ * <td valign='top' rowspan='1' colspan='1'>content of the CDATA Section</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMComment</td>
- * <td valign='top' rowspan='1' colspan='1'><code>"#comment"</code></td>
- * <td valign='top' rowspan='1' colspan='1'>content of
- * the comment</td>
+ * <td valign='top' rowspan='1' colspan='1'>"#comment"</td>
+ * <td valign='top' rowspan='1' colspan='1'>content of the comment</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMDocument</td>
- * <td valign='top' rowspan='1' colspan='1'><code>"#document"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>"#document"</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMDocumentFragment</td>
- * <td valign='top' rowspan='1' colspan='1'>
- * <code>"#document-fragment"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>"#document-fragment"</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMDocumentType</td>
* <td valign='top' rowspan='1' colspan='1'>document type name</td>
- * <td valign='top' rowspan='1' colspan='1'>
- * null</td>
+ * <td valign='top' rowspan='1' colspan='1'>null</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
@@ -121,8 +116,7 @@ class DOMUserDataHandler;
* <td valign='top' rowspan='1' colspan='1'>DOMNotation</td>
* <td valign='top' rowspan='1' colspan='1'>notation name</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
- * <td valign='top' rowspan='1' colspan='1'>
- * null</td>
+ * <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMProcessingInstruction</td>
@@ -132,8 +126,7 @@ class DOMUserDataHandler;
* </tr>
* <tr>
* <td valign='top' rowspan='1' colspan='1'>DOMText</td>
- * <td valign='top' rowspan='1' colspan='1'>
- * <code>"#text"</code></td>
+ * <td valign='top' rowspan='1' colspan='1'>"#text"</td>
* <td valign='top' rowspan='1' colspan='1'>content of the text node</td>
* <td valign='top' rowspan='1' colspan='1'>null</td>
* </tr>
diff --git a/src/xercesc/dom/DOMXPathResult.hpp b/src/xercesc/dom/DOMXPathResult.hpp
index ee5f261f59efd0d57dfa280351257d09b2da51b7..288c387850f8e9fe939f7d99142029c5244b25b1 100644
--- a/src/xercesc/dom/DOMXPathResult.hpp
+++ b/src/xercesc/dom/DOMXPathResult.hpp
@@ -73,16 +73,17 @@ public:
// -----------------------------------------------------------------------
/** @name Public Contants */
//@{
- /** ANY_TYPE
- * This code does not represent a specific type. An evaluation of an XPath
+ /**
+ * <p>ANY_TYPE
+ * <br>This code does not represent a specific type. An evaluation of an XPath
* expression will never produce this type. If this type is requested, then
* the evaluation returns whatever type naturally results from evaluation
* of the expression.
* If the natural result is a node set when ANY_TYPE was requested, then
* UNORDERED_NODE_ITERATOR_TYPE is always the resulting type. Any other
* representation of a node set must be explicitly requested.
- * ANY_UNORDERED_NODE_TYPE
- * The result is a node set as defined by [XPath 1.0] and will be accessed
+ * <p>ANY_UNORDERED_NODE_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] and will be accessed
* as a single node, which may be nullif the node set is empty. Document
* modification does not invalidate the node, but may mean that the result
* node no longer corresponds to the current document. This is a convenience
@@ -90,12 +91,12 @@ public:
* in the resulting set has been found.
* If there is more than one node in the actual result, the single node
* returned might not be the first in document order.
- * BOOLEAN_TYPE
- * The result is a boolean as defined by [XPath 1.0]. Document modification
+ * <p>BOOLEAN_TYPE
+ * <br>The result is a boolean as defined by [XPath 1.0]. Document modification
* does not invalidate the boolean, but may mean that reevaluation would not
* yield the same boolean.
- * FIRST_ORDERED_NODE_TYPE
- * The result is a node set as defined by [XPath 1.0] and will be accessed
+ * <p>FIRST_ORDERED_NODE_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] and will be accessed
* as a single node, which may be null if the node set is empty. Document
* modification does not invalidate the node, but may mean that the result
* node no longer corresponds to the current document. This is a convenience
@@ -103,30 +104,30 @@ public:
* node in document order of the resulting set has been found.
* If there are more than one node in the actual result, the single node
* returned will be the first in document order.
- * NUMBER_TYPE
- * The result is a number as defined by [XPath 1.0]. Document modification does
+ * <p>NUMBER_TYPE
+ * <br>The result is a number as defined by [XPath 1.0]. Document modification does
* not invalidate the number, but may mean that reevaluation would not yield the
* same number.
- * ORDERED_NODE_ITERATOR_TYPE
- * The result is a node set as defined by [XPath 1.0] that will be accessed
+ * <p>ORDERED_NODE_ITERATOR_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] that will be accessed
* iteratively, which will produce document-ordered nodes. Document modification
* invalidates the iteration.
- * ORDERED_NODE_SNAPSHOT_TYPE
- * The result is a node set as defined by [XPath 1.0] that will be accessed as a
+ * <p>ORDERED_NODE_SNAPSHOT_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] that will be accessed as a
* snapshot list of nodes that will be in original document order. Document
* modification does not invalidate the snapshot but may mean that reevaluation would
* not yield the same snapshot and nodes in the snapshot may have been altered, moved,
* or removed from the document.
- * STRING_TYPE
- * The result is a string as defined by [XPath 1.0]. Document modification does not
+ * <p>STRING_TYPE
+ * <br>The result is a string as defined by [XPath 1.0]. Document modification does not
* invalidate the string, but may mean that the string no longer corresponds to the
* current document.
- * UNORDERED_NODE_ITERATOR_TYPE
- * The result is a node set as defined by [XPath 1.0] that will be accessed iteratively,
+ * <p>UNORDERED_NODE_ITERATOR_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] that will be accessed iteratively,
* which may not produce nodes in a particular order. Document modification invalidates the iteration.
* This is the default type returned if the result is a node set and ANY_TYPE is requested.
- * UNORDERED_NODE_SNAPSHOT_TYPE
- * The result is a node set as defined by [XPath 1.0] that will be accessed as a
+ * <p>UNORDERED_NODE_SNAPSHOT_TYPE
+ * <br>The result is a node set as defined by [XPath 1.0] that will be accessed as a
* snapshot list of nodes that may not be in a particular order. Document modification
* does not invalidate the snapshot but may mean that reevaluation would not yield the same
* snapshot and nodes in the snapshot may have been altered, moved, or removed from the document.
diff --git a/src/xercesc/framework/XMLGrammarPool.hpp b/src/xercesc/framework/XMLGrammarPool.hpp
index d221bf621d86da1a13f809751e785becba63a0cb..3244aae4b3d3bc8d4e41039c2612cd6626dcf5e4 100644
--- a/src/xercesc/framework/XMLGrammarPool.hpp
+++ b/src/xercesc/framework/XMLGrammarPool.hpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.15 2004/12/21 16:02:51 cargilld
+ * Attempt to fix various apidoc problems.
+ *
* Revision 1.14 2004/09/29 19:27:07 cargilld
* Fix for Jira-1217: fixing problems with getXSModel.
*
@@ -113,7 +116,7 @@ public :
* it should return false; otherwise, it should return true, so that
* the caller knows whether the grammar has been adopted.
*
- * @param gramToCache: the Grammar to be cached in the grammar pool
+ * @param gramToCache the Grammar to be cached in the grammar pool
* @return true if the grammar pool has elected to cache the grammar (in which case
* it is assumed to have adopted it); false if it does not cache it
*
@@ -123,7 +126,7 @@ public :
/**
* retrieveGrammar
*
- * @param gramDesc: the Grammar Description used to search for grammar
+ * @param gramDesc the Grammar Description used to search for grammar
* cached in the grammar pool
*
*/
@@ -135,7 +138,7 @@ public :
*
* grammar removed from the grammar pool and owned by the caller
*
- * @param nameSpaceKey: Key used to search for grammar in the grammar pool
+ * @param nameSpaceKey Key used to search for grammar in the grammar pool
* @return the grammar that was removed from the pool (0 if none)
*/
virtual Grammar* orphanGrammar(const XMLCh* const nameSpaceKey) = 0;
diff --git a/src/xercesc/framework/psvi/PSVIItem.hpp b/src/xercesc/framework/psvi/PSVIItem.hpp
index eeb2a50c027d0ff1e599ae558b9925940bdbbe9a..dff48ca809b1d40668e7e2179289df19de9c7e39 100644
--- a/src/xercesc/framework/psvi/PSVIItem.hpp
+++ b/src/xercesc/framework/psvi/PSVIItem.hpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.11 2004/12/21 16:02:51 cargilld
+ * Attempt to fix various apidoc problems.
+ *
* Revision 1.10 2004/09/13 21:22:42 peiyongz
* new method: getActualValue()
*
@@ -241,10 +244,10 @@ public:
void setValidity(PSVIItem::VALIDITY_STATE validity);
/** reset the object
- * @param validationContext: corresponds to schema validation context property
- * @param normalizedValue: corresponds to schema normalized value property
- * @param validityState: state of item's validity
- * @param assessmentType: type of assessment carried out on item
+ * @param validationContext corresponds to schema validation context property
+ * @param normalizedValue corresponds to schema normalized value property
+ * @param validityState state of item's validity
+ * @param assessmentType type of assessment carried out on item
*/
void reset(
const XMLCh* const validationContext
diff --git a/src/xercesc/util/XMLResourceIdentifier.hpp b/src/xercesc/util/XMLResourceIdentifier.hpp
index a86ca277ab5959b2565c6afd73bf10769b403a05..c504756de5d81354c994d82d309ea6d95e523427 100644
--- a/src/xercesc/util/XMLResourceIdentifier.hpp
+++ b/src/xercesc/util/XMLResourceIdentifier.hpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.9 2004/12/21 16:02:51 cargilld
+ * Attempt to fix various apidoc problems.
+ *
* Revision 1.8 2004/12/03 19:40:32 cargilld
* Change call to resolveEntity to pass in public id so that only one call to resolveEntity is needed (a follow-on to Alberto's fix).
*
@@ -121,14 +124,14 @@ class XMLUTIL_EXPORT XMLResourceIdentifier
{
public:
+ //@{
enum ResourceIdentifierType {
SchemaGrammar = 0,
SchemaImport,
SchemaInclude,
SchemaRedefine ,
ExternalEntity,
- UnKnown = 255
- //@{
+ UnKnown = 255
};
/** @name Constructors and Destructor */
@@ -158,6 +161,8 @@ public:
const XMLCh* getBaseURI() const;
const XMLCh* getNameSpace() const;
+ //@}
+
private :
const ResourceIdentifierType fResourceIdentifierType;
diff --git a/src/xercesc/util/XMLString.hpp b/src/xercesc/util/XMLString.hpp
index 3d04923b9ef8af28a4f1526a617ef799d238ce27..2c6c50549730266e860bcacbdd0f6dd7dc3dc795 100644
--- a/src/xercesc/util/XMLString.hpp
+++ b/src/xercesc/util/XMLString.hpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.31 2004/12/21 16:02:51 cargilld
+ * Attempt to fix various apidoc problems.
+ *
* Revision 1.30 2004/12/14 02:09:20 cargilld
* Performance update from Christian Will.
*
@@ -1558,6 +1561,7 @@ public:
* The implementation will call MemoryManager::deallocate and then turn the string to a null pointer.
*
* @param buf The string to be deleted and become a null pointer.
+ * @param manager The MemoryManager to use to allocate objects
*/
static void release
(