You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2004/09/26 03:06:31 UTC

cvs commit: xml-xerces/c/src/xercesc/util XMLEntityResolver.hpp XMLResourceIdentifier.hpp

cargilld    2004/09/25 18:06:31

  Modified:    c/src/xercesc/dom DOMDocumentType.hpp
               c/src/xercesc/dom/deprecated NodeIteratorImpl.hpp
               c/src/xercesc/dom/impl DOMNodeIteratorImpl.hpp
               c/src/xercesc/sax AttributeList.hpp EntityResolver.hpp
               c/src/xercesc/sax2 Attributes.hpp
               c/src/xercesc/util XMLEntityResolver.hpp
                        XMLResourceIdentifier.hpp
  Log:
  Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  
  Revision  Changes    Path
  1.8       +5 -5      xml-xerces/c/src/xercesc/dom/DOMDocumentType.hpp
  
  Index: DOMDocumentType.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/DOMDocumentType.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DOMDocumentType.hpp	8 Sep 2004 13:55:39 -0000	1.7
  +++ DOMDocumentType.hpp	26 Sep 2004 01:06:30 -0000	1.8
  @@ -92,10 +92,10 @@
        * A <code>DOMNamedNodeMap</code> containing the general entities, both
        * external and internal, declared in the DTD. Parameter entities are
        * not contained. Duplicates are discarded. For example in:
  -     * <pre>&lt;!DOCTYPE
  -     * ex SYSTEM "ex.dtd" [ &lt;!ENTITY foo "foo"&gt; &lt;!ENTITY bar
  -     * "bar"&gt; &lt;!ENTITY bar "bar2"&gt; &lt;!ENTITY % baz "baz"&gt;
  -     * ]&gt; &lt;ex/&gt;</pre>
  +     * <code>&lt;!DOCTYPE<br>
  +     * ex SYSTEM "ex.dtd" [ &lt;!ENTITY foo "foo"&gt; &lt;!ENTITY bar<br>
  +     * "bar"&gt; &lt;!ENTITY bar "bar2"&gt; &lt;!ENTITY % baz "baz"&gt;<br>
  +     * ]&gt; &lt;ex/&gt;<br></code>
        *  the interface provides access to <code>foo</code>
        * and the first declaration of <code>bar</code> but not the second
        * declaration of <code>bar</code> or <code>baz</code>. Every node in
  
  
  
  1.8       +5 -5      xml-xerces/c/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp
  
  Index: NodeIteratorImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/deprecated/NodeIteratorImpl.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NodeIteratorImpl.hpp	8 Sep 2004 13:55:43 -0000	1.7
  +++ NodeIteratorImpl.hpp	26 Sep 2004 01:06:30 -0000	1.8
  @@ -106,10 +106,10 @@
   		DOM_Node fCurrentNode;
   
   		// The direction of the iterator on the fCurrentNode.
  -		//  <pre>
  -		//  nextNode()  ==      fForward = true;
  -		//  previousNode() ==   fForward = false;
  -		//  </pre>
  +		//  <code>
  +		//  nextNode()  ==      fForward = true;<br>
  +		//  previousNode() ==   fForward = false;<br>
  +		//  </code>
   		bool fForward;
   
   
  
  
  
  1.6       +5 -5      xml-xerces/c/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp
  
  Index: DOMNodeIteratorImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeIteratorImpl.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DOMNodeIteratorImpl.hpp	8 Sep 2004 13:55:52 -0000	1.5
  +++ DOMNodeIteratorImpl.hpp	26 Sep 2004 01:06:30 -0000	1.6
  @@ -77,10 +77,10 @@
           DOMNode* fCurrentNode;
   
           // The direction of the iterator on the fCurrentNode.
  -        //  <pre>
  -        //  nextNode()  ==      fForward = true;
  -        //  previousNode() ==   fForward = false;
  -        //  </pre>
  +        //  <code>
  +        //  nextNode()  ==      fForward = true;<br>
  +        //  previousNode() ==   fForward = false;<br>
  +        //  </code>
           bool fForward;
   
       public:
  
  
  
  1.5       +18 -15    xml-xerces/c/src/xercesc/sax/AttributeList.hpp
  
  Index: AttributeList.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/AttributeList.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AttributeList.hpp	8 Sep 2004 13:56:19 -0000	1.4
  +++ AttributeList.hpp	26 Sep 2004 01:06:30 -0000	1.5
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.5  2004/09/26 01:06:30  cargilld
  + * Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  + *
    * Revision 1.4  2004/09/08 13:56:19  peiyongz
    * Apache License Version 2.0
    *
  @@ -86,16 +89,16 @@
     * from the AttributeList.  First, it can iterate through the entire
     * list:
     *
  -  * <pre>
  -  * public void startElement (String name, AttributeList atts) {
  -  *   for (int i = 0; i < atts.getLength(); i++) {
  -  *     String name = atts.getName(i);
  -  *     String type = atts.getType(i);
  -  *     String value = atts.getValue(i);
  -  *     [...]
  -  *   }
  +  * <code>
  +  * public void startElement (String name, AttributeList atts) {<br>
  +  * &nbsp;for (int i = 0; i < atts.getLength(); i++) {<br>
  +  * &nbsp;&nbsp;String name = atts.getName(i);<br>
  +  * &nbsp;&nbsp;String type = atts.getType(i);<br>
  +  * &nbsp;&nbsp;String value = atts.getValue(i);<br>
  +  * &nbsp;&nbsp;[...]<br>
  +  * &nbsp;}<br>
     * }
  -  * </pre>
  +  * </code>
     *
     * (Note that the result of getLength() will be zero if there
     * are no attributes.)
  @@ -103,13 +106,13 @@
     * As an alternative, the application can request the value or
     * type of specific attributes:
     *
  -  * <pre>
  -  * public void startElement (String name, AttributeList atts) {
  -  *   String identifier = atts.getValue("id");
  -  *   String label = atts.getValue("label");
  -  *   [...]
  +  * <code>
  +  * public void startElement (String name, AttributeList atts) {<br>
  +  * &nbsp;String identifier = atts.getValue("id");<br>
  +  * &nbsp;String label = atts.getValue("label");<br>
  +  * &nbsp;[...]<br>
     * }
  -  * </pre>
  +  * </code>
     *
     * The AttributeListImpl helper class provides a convenience
     * implementation for use by parser or application writers.
  
  
  
  1.6       +24 -21    xml-xerces/c/src/xercesc/sax/EntityResolver.hpp
  
  Index: EntityResolver.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax/EntityResolver.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EntityResolver.hpp	8 Sep 2004 13:56:19 -0000	1.5
  +++ EntityResolver.hpp	26 Sep 2004 01:06:30 -0000	1.6
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/09/26 01:06:30  cargilld
  + * Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  + *
    * Revision 1.5  2004/09/08 13:56:19  peiyongz
    * Apache License Version 2.0
    *
  @@ -87,27 +90,27 @@
     * with a special character stream for the entity with the system
     * identifier "http://www.myhost.com/today":</p>
     *
  -  *<pre>
  -  *#include <xercesc/sax/EntityResolver.hpp>
  -  *#include <xercesc/sax/InputSource.hpp>
  -  *
  -  *class MyResolver : public EntityResolver {
  -  *  public:
  -  *    InputSource resolveEntity (const XMLCh* const publicId,
  -  *                               const XMLCh* const systemId);
  -  *   ...
  -  *   };
  -  *
  -  *  MyResolver::resolveEntity {
  -  *    if (XMLString::compareString(systemId, "http://www.myhost.com/today")) {
  -  *      MyReader* reader = new MyReader();
  -  *      return new InputSource(reader);
  -  *    } else {
  -  *      return null;
  -  *    }
  -  *  }
  -  *
  -  *</pre>
  +  *<code>
  +  *#include <xercesc/sax/EntityResolver.hpp><br>
  +  *#include <xercesc/sax/InputSource.hpp><br>
  +  *<br>
  +  *class MyResolver : public EntityResolver {<br>
  +  *  public:<br>&nbsp;
  +  *    InputSource resolveEntity (const XMLCh* const publicId, const XMLCh* const systemId);<br>&nbsp;&nbsp;
  +  *    <br>
  +  *   ...<br>&nbsp;&nbsp;
  +  *   };<br>&nbsp;
  +  *<br>
  +  *&nbsp;MyResolver::resolveEntity {<br>
  +  *&nbsp;&nbsp;if (XMLString::compareString(systemId, "http://www.myhost.com/today")) {<br>
  +  *&nbsp;&nbsp;&nbsp;MyReader* reader = new MyReader();<br>
  +  *&nbsp;&nbsp;&nbsp;return new InputSource(reader);<br>
  +  *&nbsp;&nbsp;} else {<br>
  +  *&nbsp;&nbsp;&nbsp;return null;<br>
  +  *&nbsp;&nbsp;}<br>
  +  *&nbsp;}<br>
  +  *<br>
  +  *</code>
     *
     * <p>The application can also use this interface to redirect system
     * identifiers to local URIs or to look up replacements in a catalog
  
  
  
  1.6       +20 -17    xml-xerces/c/src/xercesc/sax2/Attributes.hpp
  
  Index: Attributes.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/sax2/Attributes.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Attributes.hpp	8 Sep 2004 13:56:20 -0000	1.5
  +++ Attributes.hpp	26 Sep 2004 01:06:31 -0000	1.6
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2004/09/26 01:06:31  cargilld
  + * Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  + *
    * Revision 1.5  2004/09/08 13:56:20  peiyongz
    * Apache License Version 2.0
    *
  @@ -87,18 +90,18 @@
     * from the Attributes.  First, it can iterate through the entire
     * list:
     *
  -  * <pre>
  -  * public void startElement (String uri, String localpart, String qName, Attributes atts) {
  -  *   for (int i = 0; i < atts.getLength(); i++) {
  -  *     String Qname = atts.getQName(i);
  -  *		String URI   = atts.getURI(i)
  -  *		String local = atts.GetLocalName(i)
  -  *     String type  = atts.getType(i);
  -  *     String value = atts.getValue(i);
  -  *     [...]
  -  *   }
  +  * <code>
  +  * public void startElement (String uri, String localpart, String qName, Attributes atts) {<br>
  +  * &nbsp;for (int i = 0; i < atts.getLength(); i++) {<br>
  +  * &nbsp;&nbsp;String Qname = atts.getQName(i);<br>
  +  * &nbsp;&nbsp;String URI   = atts.getURI(i)<br>
  +  * &nbsp;&nbsp;String local = atts.GetLocalName(i)<br>
  +  * &nbsp;&nbsp;String type  = atts.getType(i);<br>
  +  * &nbsp;&nbsp;String value = atts.getValue(i);<br>
  +  * &nbsp;&nbsp;[...]<br>
  +  * &nbsp;}<br>
     * }
  -  * </pre>
  +  * </code>
     *
     * (Note that the result of getLength() will be zero if there
     * are no attributes.)
  @@ -106,13 +109,13 @@
     * As an alternative, the application can request the value or
     * type of specific attributes:
     *
  -  * <pre>
  -  * public void startElement (String uri, String localpart, String qName, Attributes atts) {
  -  *   String identifier = atts.getValue("id");
  -  *   String label = atts.getValue("label");
  -  *   [...]
  +  * <code>
  +  * public void startElement (String uri, String localpart, String qName, Attributes atts) {<br>
  +  * &nbsp;String identifier = atts.getValue("id");<br>
  +  * &nbsp;String label = atts.getValue("label");<br>
  +  * &nbsp;[...]<br>
     * }
  -  * </pre>
  +  * </code>
     *
     * The AttributesImpl helper class provides a convenience
     * implementation for use by parser or application writers.
  
  
  
  1.3       +27 -24    xml-xerces/c/src/xercesc/util/XMLEntityResolver.hpp
  
  Index: XMLEntityResolver.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLEntityResolver.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLEntityResolver.hpp	8 Sep 2004 13:56:24 -0000	1.2
  +++ XMLEntityResolver.hpp	26 Sep 2004 01:06:31 -0000	1.3
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.3  2004/09/26 01:06:31  cargilld
  + * Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  + *
    * Revision 1.2  2004/09/08 13:56:24  peiyongz
    * Apache License Version 2.0
    *
  @@ -67,30 +70,30 @@
     * with a special character stream for the entity with the system
     * identifier "http://www.myhost.com/today":</p>
     *
  -  *<pre>
  -  * #include <xercesc/util/XMLEntityResolver.hpp>
  -  * #include <xercesc/sax/InputSource.hpp>
  -  *
  -  * class MyResolver : public XMLEntityResolver {
  -  *  public:
  -  *    InputSource resolveEntity (XMLResourceIdentifier* xmlri);
  -  *   ...
  -  *   };
  -  *
  -  *  MyResolver::resolveEntity(XMLResourceIdentifier* xmlri) {
  -  *    switch(xmlri->getResourceIdentifierType()) {
  -  *      case XMLResourceIdentifier::SystemId: 
  -  *        if (XMLString::compareString(xmlri->getSystemId(), "http://www.myhost.com/today")) {
  -  *          MyReader* reader = new MyReader();
  -  *          return new InputSource(reader);
  -  *        } else {
  -  *          return null;
  -  *        }
  -  *        break;
  -  *      default:
  -  *        return null;
  -  *    }
  -  *  }</pre>
  +  *<code>
  +  * #include <xercesc/util/XMLEntityResolver.hpp><br>
  +  * #include <xercesc/sax/InputSource.hpp><br>
  +  *<br>
  +  *&nbsp;class MyResolver : public XMLEntityResolver {<br>
  +  *&nbsp;&nbsp;public:<br>
  +  *&nbsp;&nbsp;&nbsp;InputSource resolveEntity (XMLResourceIdentifier* xmlri);<br>
  +  *&nbsp;&nbsp;&nbsp;...<br>
  +  *&nbsp;&nbsp;};<br>
  +  *<br>
  +  *&nbsp;MyResolver::resolveEntity(XMLResourceIdentifier* xmlri) {<br>
  +  *&nbsp;&nbsp;switch(xmlri->getResourceIdentifierType()) {<br>
  +  *&nbsp;&nbsp;&nbsp;case XMLResourceIdentifier::SystemId:<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;if (XMLString::compareString(xmlri->getSystemId(), "http://www.myhost.com/today")) {<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MyReader* reader = new MyReader();<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return new InputSource(reader);<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;} else {<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return null;<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;}<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;break;<br>
  +  *&nbsp;&nbsp;&nbsp;default:<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;return null;<br>
  +  *&nbsp;&nbsp;}<br>
  +  *&nbsp;}</code>
     *
     * <p>The application can also use this interface to redirect system
     * identifiers to local URIs or to look up replacements in a catalog
  
  
  
  1.7       +27 -24    xml-xerces/c/src/xercesc/util/XMLResourceIdentifier.hpp
  
  Index: XMLResourceIdentifier.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLResourceIdentifier.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XMLResourceIdentifier.hpp	8 Sep 2004 13:56:24 -0000	1.6
  +++ XMLResourceIdentifier.hpp	26 Sep 2004 01:06:31 -0000	1.7
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2004/09/26 01:06:31  cargilld
  + * Fix documentation generation problem.  Replace <pre> with <code>.  Patch from James Littlejohn.
  + *
    * Revision 1.6  2004/09/08 13:56:24  peiyongz
    * Apache License Version 2.0
    *
  @@ -83,30 +86,30 @@
     * with a special character stream for the entity with the system
     * identifier "http://www.myhost.com/today":</p>
     *
  -  *<pre>
  -  * #include <xercesc/util/XMLEntityResolver.hpp>
  -  * #include <xercesc/sax/InputSource.hpp>
  -  *
  -  * class MyResolver : public XMLEntityResolver {
  -  *  public:
  -  *    InputSource resolveEntity (XMLResourceIdentifier* xmlri);
  -  *   ...
  -  *   };
  -  *
  -  *  MyResolver::resolveEntity(XMLResourceIdentifier* xmlri) {
  -  *    switch(xmlri->getResourceIdentifierType()) {
  -  *      case XMLResourceIdentifier::SystemId: 
  -  *        if (XMLString::compareString(xmlri->getSystemId(), "http://www.myhost.com/today")) {
  -  *          MyReader* reader = new MyReader();
  -  *          return new InputSource(reader);
  -  *        } else {
  -  *          return null;
  -  *        }
  -  *        break;
  -  *      default:
  -  *        return null;
  -  *    }
  -  *  }</pre>
  +  *<code>
  +  * #include <xercesc/util/XMLEntityResolver.hpp><br>
  +  * #include <xercesc/sax/InputSource.hpp><br>
  +  *<br>
  +  *&nbsp;class MyResolver : public XMLEntityResolver {<br>
  +  *&nbsp;&nbsp;public:<br>
  +  *&nbsp;&nbsp;&nbsp;InputSource resolveEntity (XMLResourceIdentifier* xmlri);<br>
  +  *&nbsp;&nbsp;&nbsp;...<br>
  +  *&nbsp;&nbsp;};<br>
  +  *<br>
  +  *&nbsp;&nbsp;MyResolver::resolveEntity(XMLResourceIdentifier* xmlri) {<br>
  +  *&nbsp;&nbsp;&nbsp;switch(xmlri->getResourceIdentifierType()) {<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;case XMLResourceIdentifier::SystemId:<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if (XMLString::compareString(xmlri->getSystemId(), "http://www.myhost.com/today")) {<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;MyReader* reader = new MyReader();<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return new InputSource(reader);<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} else {<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return null;<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;break;<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;default:<br>
  +  *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return null;<br>
  +  *&nbsp;&nbsp;&nbsp;}<br>
  +  *&nbsp;&nbsp;}</code>
     *
     * @see SAXParser#setXMLEntityResolver
     * @see InputSource#InputSource
  
  
  

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