You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/10/02 02:16:23 UTC

cvs commit: xml-xerces/java/design/xsl design.xsl

andyc       00/10/01 17:16:23

  Modified:    java/design Tag: xerces_j_2 design.html design.zip
               java/design/xml Tag: xerces_j_2 design.dtd design.xml
               java/design/xsl Tag: xerces_j_2 design.xsl
  Log:
  Updated design to match the package re-organization.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +453 -461  xml-xerces/java/design/Attic/design.html
  
  Index: design.html
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/design/Attic/design.html,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- design.html	2000/09/27 18:58:09	1.1.2.7
  +++ design.html	2000/10/02 00:16:12	1.1.2.8
  @@ -9,7 +9,7 @@
    <BODY>
     <H1 align="center">Xerces-J 2.0       Design     </H1>
     <H2>Classes and Interfaces</H2>
  -  <H3>Base</H3>
  +  <H3>Xerces Native Interface (XNI)</H3>
     <BLOCKQUOTE>
      <A name="XMLComponent"><DL class="interface">
        <DT>interface <SPAN class="interface-title">XMLComponent</SPAN>
  @@ -49,168 +49,23 @@
       </DL>
      </A></BLOCKQUOTE>
     <BLOCKQUOTE>
  -   <A name="XMLString"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLString</SPAN>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>char[]   <SPAN class="field-title">ch</SPAN>
  -       <LI>int <SPAN class="field-title">offset</SPAN>
  -       <LI>int <SPAN class="field-title">length</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLString</SPAN>      (
  -        )
  -       <LI>
  -        <SPAN class="constructor-title">XMLString</SPAN>      (   char[]
  -         <SPAN class="param-title">ch</SPAN>, int <SPAN
  -        class="param-title">offset</SPAN>, int <SPAN
  -        class="param-title">length</SPAN>          )
  -      </UL>
  +   <A name="XMLEntityHandler"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLEntityHandler</SPAN>
        <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">setValues</SPAN>      (   char[]
  -         <SPAN class="param-title">ch</SPAN>, int <SPAN
  -        class="param-title">offset</SPAN>, int <SPAN
  -        class="param-title">length</SPAN>          )
          <LI>
  -        <SPAN class="method-title">clear</SPAN>      (             )
  -       <LI>
  -        <SPAN class="method-title">equals</SPAN>      (   char[]   <SPAN
  -        class="param-title">ch</SPAN>, int <SPAN
  -        class="param-title">offset</SPAN>, int <SPAN
  -        class="param-title">length</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">equals</SPAN>      (   <SPAN
  +        <SPAN class="method-title">startEntity</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">s</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">toString</SPAN>      (             )
  -        :    <SPAN class="class-title">String</SPAN>
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <BLOCKQUOTE>
  -   <A name="XMLStringBuffer"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLStringBuffer</SPAN>
  -     <DD class="extends">      extends      <SPAN class="class-title">XMLString</SPAN>
  -     <DD class="constants">      constants:      <UL>
  -       <LI>int <SPAN class="constant-title">DEFAULT_SIZE</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLStringBuffer</SPAN>      (
  -        )
  -       <LI>
  -        <SPAN class="constructor-title">XMLStringBuffer</SPAN>      (
  -        int <SPAN class="param-title">size</SPAN>          )
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">clear</SPAN>      (             )
  -       <LI>
  -        <SPAN class="method-title">append</SPAN>      (   char <SPAN
  -        class="param-title">c</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">append</SPAN>      (   <SPAN
  +        class="param-title">name</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">s</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">append</SPAN>      (   char[]   <SPAN
  -        class="param-title">ch</SPAN>, int <SPAN
  -        class="param-title">offset</SPAN>, int <SPAN
  -        class="param-title">length</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">append</SPAN>      (   <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">s</SPAN>          )
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <H3>Error Handling</H3>
  -  <BLOCKQUOTE>
  -   <A name="XMLErrorReporter"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLErrorReporter</SPAN>
  -     <DD class="implements">      implements      <SPAN class="interface-title">XMLComponent</SPAN>
  -     <DD class="constants">      constants:      <UL>
  -       <LI>short <SPAN class="constant-title">SEVERITY_WARNING</SPAN>
  -       <LI>short <SPAN class="constant-title">SEVERITY_ERROR</SPAN>
  -       <LI>short <SPAN class="constant-title">SEVERITY_FATAL_ERROR</SPAN>
  -      </UL>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>
  -        <SPAN class="class-title">Locale</SPAN> <SPAN class="field-title">fLocale</SPAN>
  -       <LI>
  -        <SPAN class="class-title">Hashtable</SPAN>      &lt;   <SPAN
  -        class="interface-title">MessageFormatter</SPAN>      &gt;
  -         <SPAN class="field-title">fMessageFormatters</SPAN>
  -       <LI>
  -        <SPAN class="interface-title">ErrorHandler</SPAN> <SPAN class="field-title">fErrorHandler</SPAN>
  -       <LI>boolean <SPAN class="field-title">fContinueAfterFatalError</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLErrorReporter</SPAN>      (
  -        )
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">setLocale</SPAN>      (   <SPAN
  -        class="class-title">Locale</SPAN> <SPAN
  -        class="param-title">locale</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">putMessageFormatter</SPAN>      (
  -         <SPAN class="class-title">String</SPAN> <SPAN
  -        class="param-title">domain</SPAN>, <SPAN
  -        class="interface-title">MessageFormatter</SPAN> <SPAN
  -        class="param-title">messageFormatter</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">getMessageFormatter</SPAN>      (
  -         <SPAN class="class-title">String</SPAN> <SPAN
  -        class="param-title">domain</SPAN>          )       :    <SPAN class="interface-title">MessageFormatter</SPAN>
  -       <LI>
  -        <SPAN class="method-title">removeMessageFormatter</SPAN>      (
  -         <SPAN class="class-title">String</SPAN> <SPAN
  -        class="param-title">domain</SPAN>          )       :    <SPAN class="interface-title">MessageFormatter</SPAN>
  -       <LI>
  -        <SPAN class="method-title">reportError</SPAN>      (   <SPAN
  +        class="param-title">publicId</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">domain</SPAN>, <SPAN
  +        class="param-title">systemId</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">key</SPAN>, <SPAN
  -        class="class-title">Object</SPAN>[]   <SPAN
  -        class="param-title">arguments</SPAN>, short <SPAN
  -        class="param-title">severity</SPAN>          )
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <H3>Scanning</H3>
  -  <BLOCKQUOTE>
  -   <A name="XMLDocumentScanner"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLDocumentScanner</SPAN>
  -     <DD class="implements">      implements      <SPAN
  -      class="interface-title">XMLComponent</SPAN>, <SPAN class="interface-title">XMLDocumentSource</SPAN>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>
  -        <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
  -       <LI>
  -        <SPAN class="class-title">XMLErrorReporter</SPAN> <SPAN class="field-title">fErrorReporter</SPAN>
  -       <LI>
  -        <SPAN class="class-title">XMLEntityManager</SPAN> <SPAN class="field-title">fEntityManager</SPAN>
  +        class="param-title">encoding</SPAN>          )
          <LI>
  -        <SPAN class="class-title">XMLDTDScanner</SPAN> <SPAN class="field-title">fDTDScanner</SPAN>
  -       <LI>boolean <SPAN class="field-title">fNamespaces</SPAN>
  -       <LI>
  -        <SPAN class="interface-title">XMLDocumentHandler</SPAN> <SPAN class="field-title">fDocumentHandler</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLDocumentScanner</SPAN>      (
  -        )
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">scanDocument</SPAN>      (   boolean
  -         <SPAN class="param-title">complete</SPAN>          )       :    boolean
  +        <SPAN class="method-title">endEntity</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">name</SPAN>          )
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  @@ -240,8 +95,6 @@
           class="class-title">String</SPAN> <SPAN
           class="param-title">encoding</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">actualEncoding</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
           class="param-title">standalone</SPAN>          )
          <LI>
           <SPAN class="method-title">doctypeDecl</SPAN>      (   <SPAN
  @@ -299,10 +152,8 @@
           <SPAN class="method-title">textDecl</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
           class="param-title">version</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">encoding</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">actualEncoding</SPAN>          )
  +        class="param-title">encoding</SPAN>          )
          <LI>
           <SPAN class="method-title">endDocument</SPAN>      (
           )
  @@ -310,188 +161,61 @@
       </DL>
      </A></BLOCKQUOTE>
     <BLOCKQUOTE>
  -   <A name="XMLAttributes"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLAttributes</SPAN>
  -     <DD class="implements">      implements      <SPAN
  -      class="interface-title">AttributeList</SPAN>, <SPAN class="interface-title">Attributes</SPAN>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>boolean <SPAN class="field-title">fNamespaces</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  +   <A name="XMLDocumentFilter"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDocumentFilter</SPAN>
  +     <DD class="extends">      extends      <SPAN class="interface-title">XMLDocumentHandler</SPAN>
  +      <SPAN class="interface-title">XMLDocumentSource</SPAN>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDSource"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDSource</SPAN>
  +     <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="constructor-title">XMLAttributes</SPAN>      (
  -        )
  +        <SPAN class="method-title">setDTDHandler</SPAN>      (   <SPAN
  +        class="interface-title">XMLDTDHandler</SPAN> <SPAN
  +        class="param-title">dtdHandler</SPAN>          )
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDHandler"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDHandler</SPAN>
  +     <DD class="extends">      extends      <SPAN class="interface-title">XMLEntityHandler</SPAN>
  +     <DD class="constants">      constants:      <UL>
  +       <LI>short <SPAN class="constant-title">CONDITIONAL_INCLUDE</SPAN>
  +       <LI>short <SPAN class="constant-title">CONDITIONAL_IGNORE</SPAN>
         </UL>
        <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="method-title">setNamespaces</SPAN>      (   boolean
  -         <SPAN class="param-title">namespaces</SPAN>          )
  +        <SPAN class="method-title">startDTD</SPAN>      (             )
          <LI>
  -        <SPAN class="method-title">setAttribute</SPAN>      (   <SPAN
  -        class="class-title">QName</SPAN> <SPAN
  -        class="param-title">name</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">type</SPAN>, <SPAN
  +        <SPAN class="method-title">comment</SPAN>      (   <SPAN
           class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">value</SPAN>          )       :    int
  -       <LI>
  -        <SPAN class="method-title">addAttributeEntity</SPAN>      (
  -        int <SPAN class="param-title">index</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">name</SPAN>, int <SPAN
  -        class="param-title">offset</SPAN>, int <SPAN
  -        class="param-title">length</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">removeAttribute</SPAN>      (   <SPAN
  -        class="class-title">QName</SPAN> <SPAN
  -        class="param-title">name</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">clear</SPAN>      (             )
  +        class="param-title">text</SPAN>          )
          <LI>
  -        <SPAN class="method-title">getLength</SPAN>      (             )
  -        :    int
  +        <SPAN class="method-title">processingInstruction</SPAN>      (
  +         <SPAN class="class-title">String</SPAN> <SPAN
  +        class="param-title">target</SPAN>, <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">data</SPAN>          )
          <LI>
  -        <SPAN class="method-title">setName</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  -        class="class-title">QName</SPAN> <SPAN
  -        class="param-title">name</SPAN>          )
  +        <SPAN class="method-title">startExternalSubset</SPAN>      (
  +        )
          <LI>
  -        <SPAN class="method-title">getName</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  -        class="class-title">QName</SPAN> <SPAN
  -        class="param-title">name</SPAN>          )
  +        <SPAN class="method-title">endExternalSubset</SPAN>      (
  +        )
          <LI>
  -        <SPAN class="method-title">setType</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  +        <SPAN class="method-title">elementDecl</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">type</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">getType</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>          )       :    <SPAN class="class-title">String</SPAN>
  +        class="param-title">name</SPAN>, <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">contentModel</SPAN>          )
          <LI>
  -        <SPAN class="method-title">setValue</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  +        <SPAN class="method-title">startAttlist</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">value</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">setValue</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">value</SPAN>          )
  +        class="param-title">elementName</SPAN>          )
          <LI>
  -        <SPAN class="method-title">getValue</SPAN>      (   int <SPAN
  -        class="param-title">index</SPAN>, <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">value</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">getEntityCount</SPAN>      (   int
  -         <SPAN class="param-title">attrIndex</SPAN>          )       :    int
  -       <LI>
  -        <SPAN class="method-title">getEntityName</SPAN>      (   int
  -         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  -        class="param-title">entityIndex</SPAN>          )       :
  -         <SPAN class="class-title">String</SPAN>
  -       <LI>
  -        <SPAN class="method-title">getEntityOffset</SPAN>      (   int
  -         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  -        class="param-title">entityIndex</SPAN>          )       :    int
  -       <LI>
  -        <SPAN class="method-title">getEntityLength</SPAN>      (   int
  -         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  -        class="param-title">entityIndex</SPAN>          )       :    int
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <BLOCKQUOTE>
  -   <A name="XMLDTDScanner"><DL class="class">
  -     <DT>class <SPAN class="class-title">XMLDTDScanner</SPAN>
  -     <DD class="implements">      implements      <SPAN
  -      class="interface-title">XMLComponent</SPAN>, <SPAN
  -      class="interface-title">XMLDTDSource</SPAN>, <SPAN class="interface-title">XMLDTDContentModelSource</SPAN>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>
  -        <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
  -       <LI>
  -        <SPAN class="class-title">XMLErrorReporter</SPAN> <SPAN class="field-title">fErrorReporter</SPAN>
  -       <LI>
  -        <SPAN class="class-title">XMLEntityManager</SPAN> <SPAN class="field-title">fEntityManager</SPAN>
  -       <LI>
  -        <SPAN class="class-title">GrammarPool</SPAN> <SPAN class="field-title">fGrammarPool</SPAN>
  -       <LI>
  -        <SPAN class="interface-title">XMLDTDHandler</SPAN> <SPAN class="field-title">fDTDHandler</SPAN>
  -       <LI>
  -        <SPAN class="interface-title">XMLDTDContentModelHandler</SPAN>
  -         <SPAN class="field-title">fDTDContentModelHandler</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLDTDScanner</SPAN>      (
  -        )
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">scanDTD</SPAN>      (   boolean <SPAN
  -        class="param-title">complete</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">scanDTDFragment</SPAN>      (
  -        boolean <SPAN class="param-title">complete</SPAN>          )
  -        :    boolean
  -       <LI>
  -        <SPAN class="method-title">scanDTDInternalSubset</SPAN>      (
  -        boolean <SPAN class="param-title">complete</SPAN>          )
  -        :    boolean
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <BLOCKQUOTE>
  -   <A name="XMLDTDSource"><DL class="interface">
  -     <DT>interface <SPAN class="interface-title">XMLDTDSource</SPAN>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">setDTDHandler</SPAN>      (   <SPAN
  -        class="interface-title">XMLDTDHandler</SPAN> <SPAN
  -        class="param-title">dtdHandler</SPAN>          )
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <BLOCKQUOTE>
  -   <A name="XMLDTDHandler"><DL class="interface">
  -     <DT>interface <SPAN class="interface-title">XMLDTDHandler</SPAN>
  -     <DD class="extends">      extends      <SPAN class="interface-title">XMLEntityHandler</SPAN>
  -     <DD class="constants">      constants:      <UL>
  -       <LI>short <SPAN class="constant-title">CONDITIONAL_INCLUDE</SPAN>
  -       <LI>short <SPAN class="constant-title">CONDITIONAL_IGNORE</SPAN>
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">startDTD</SPAN>      (             )
  -       <LI>
  -        <SPAN class="method-title">comment</SPAN>      (   <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">text</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">processingInstruction</SPAN>      (
  -         <SPAN class="class-title">String</SPAN> <SPAN
  -        class="param-title">target</SPAN>, <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">data</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">startExternalSubset</SPAN>      (
  -        )
  -       <LI>
  -        <SPAN class="method-title">endExternalSubset</SPAN>      (
  -        )
  -       <LI>
  -        <SPAN class="method-title">elementDecl</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">name</SPAN>, <SPAN
  -        class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">contentModel</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">startAttlist</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">elementName</SPAN>          )
  -       <LI>
           <SPAN class="method-title">attributeDecl</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
           class="param-title">elementName</SPAN>, <SPAN
  @@ -545,73 +269,323 @@
          <LI>
           <SPAN class="method-title">startConditional</SPAN>      (
           short <SPAN class="param-title">type</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">endConditional</SPAN>      (
  +        )
  +       <LI>
  +        <SPAN class="method-title">endDTD</SPAN>      (             )
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDFilter"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDFilter</SPAN>
  +     <DD class="extends">      extends      <SPAN class="interface-title">XMLDTDHandler</SPAN>
  +      <SPAN class="interface-title">XMLDTDSource</SPAN>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDContentModelSource"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDContentModelSource</SPAN>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">setDTDContentModelHandler</SPAN>
  +        (   <SPAN
  +        class="interface-title">XMLDTDContentModelHandler</SPAN> <SPAN
  +        class="param-title">dtdContentModelHandler</SPAN>          )
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDContentModelHandler"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDContentModelHandler</SPAN>
  +     <DD class="constants">      constants:      <UL>
  +       <LI>short <SPAN class="constant-title">TYPE_EMPTY</SPAN>
  +       <LI>short <SPAN class="constant-title">TYPE_ANY</SPAN>
  +       <LI>short <SPAN class="constant-title">TYPE_MIXED</SPAN>
  +       <LI>short <SPAN class="constant-title">TYPE_CHILDREN</SPAN>
  +       <LI>short <SPAN class="constant-title">SEPARATOR_CHOICE</SPAN>
  +       <LI>short <SPAN class="constant-title">SEPARATOR_SEQUENCE</SPAN>
  +       <LI>short <SPAN class="constant-title">OCCURS_ZERO_OR_ONE</SPAN>
  +       <LI>short <SPAN class="constant-title">OCCURS_ZERO_OR_MORE</SPAN>
  +       <LI>short <SPAN class="constant-title">OCCURS_ONE_OR_MORE</SPAN>
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">startContentModel</SPAN>      (
  +         <SPAN class="class-title">String</SPAN> <SPAN
  +        class="param-title">elementName</SPAN>, short <SPAN
  +        class="param-title">type</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">mixedElement</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">elementName</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">childrenStartGroup</SPAN>      (
  +        )
  +       <LI>
  +        <SPAN class="method-title">childrenElement</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">elementName</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">childrenSeparator</SPAN>      (
  +        short <SPAN class="param-title">separator</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">childrenOccurrence</SPAN>      (
  +        short <SPAN class="param-title">occurrence</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">childrenEndGroup</SPAN>      (
  +        )
  +       <LI>
  +        <SPAN class="method-title">endContentModel</SPAN>      (
  +        )
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLDTDContentModelFilter"><DL class="interface">
  +     <DT>interface <SPAN class="interface-title">XMLDTDContentModelFilter</SPAN>
  +     <DD class="extends">      extends      <SPAN class="interface-title">XMLDTDContentModelHandler</SPAN>
  +      <SPAN class="interface-title">XMLDTDContentModelSource</SPAN>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="QName"><DL class="class">
  +     <DT>class <SPAN class="class-title">QName</SPAN>
  +     <DD class="fields">      fields:      <UL>
  +       <LI>
  +        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">prefix</SPAN>
  +       <LI>
  +        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">localpart</SPAN>
  +       <LI>
  +        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">rawname</SPAN>
  +       <LI>
  +        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">uri</SPAN>
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">setValues</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">prefix</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">localpart</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">rawname</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">uri</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">clear</SPAN>      (             )
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLString"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLString</SPAN>
  +     <DD class="fields">      fields:      <UL>
  +       <LI>char[]   <SPAN class="field-title">ch</SPAN>
  +       <LI>int <SPAN class="field-title">offset</SPAN>
  +       <LI>int <SPAN class="field-title">length</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
  +       <LI>
  +        <SPAN class="constructor-title">XMLString</SPAN>      (
  +        )
  +       <LI>
  +        <SPAN class="constructor-title">XMLString</SPAN>      (   char[]
  +         <SPAN class="param-title">ch</SPAN>, int <SPAN
  +        class="param-title">offset</SPAN>, int <SPAN
  +        class="param-title">length</SPAN>          )
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">setValues</SPAN>      (   char[]
  +         <SPAN class="param-title">ch</SPAN>, int <SPAN
  +        class="param-title">offset</SPAN>, int <SPAN
  +        class="param-title">length</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">clear</SPAN>      (             )
  +       <LI>
  +        <SPAN class="method-title">equals</SPAN>      (   char[]   <SPAN
  +        class="param-title">ch</SPAN>, int <SPAN
  +        class="param-title">offset</SPAN>, int <SPAN
  +        class="param-title">length</SPAN>          )       :    boolean
  +       <LI>
  +        <SPAN class="method-title">equals</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">s</SPAN>          )       :    boolean
  +       <LI>
  +        <SPAN class="method-title">toString</SPAN>      (             )
  +        :    <SPAN class="class-title">String</SPAN>
  +      </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLAttributes"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLAttributes</SPAN>
  +     <DD class="implements">      implements      <SPAN
  +      class="interface-title">AttributeList</SPAN>, <SPAN class="interface-title">Attributes</SPAN>
  +     <DD class="fields">      fields:      <UL>
  +       <LI>boolean <SPAN class="field-title">fNamespaces</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
  +       <LI>
  +        <SPAN class="constructor-title">XMLAttributes</SPAN>      (
  +        )
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">setNamespaces</SPAN>      (   boolean
  +         <SPAN class="param-title">namespaces</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">setAttribute</SPAN>      (   <SPAN
  +        class="class-title">QName</SPAN> <SPAN
  +        class="param-title">name</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">type</SPAN>, <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">value</SPAN>          )       :    int
  +       <LI>
  +        <SPAN class="method-title">addAttributeEntity</SPAN>      (
  +        int <SPAN class="param-title">index</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">name</SPAN>, int <SPAN
  +        class="param-title">offset</SPAN>, int <SPAN
  +        class="param-title">length</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">removeAttribute</SPAN>      (   <SPAN
  +        class="class-title">QName</SPAN> <SPAN
  +        class="param-title">name</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">clear</SPAN>      (             )
  +       <LI>
  +        <SPAN class="method-title">getLength</SPAN>      (             )
  +        :    int
  +       <LI>
  +        <SPAN class="method-title">setName</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">QName</SPAN> <SPAN
  +        class="param-title">name</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">getName</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">QName</SPAN> <SPAN
  +        class="param-title">name</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">setType</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">type</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">getType</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>          )       :    <SPAN class="class-title">String</SPAN>
  +       <LI>
  +        <SPAN class="method-title">setValue</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">value</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">setValue</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">value</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">getValue</SPAN>      (   int <SPAN
  +        class="param-title">index</SPAN>, <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">value</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">getEntityCount</SPAN>      (   int
  +         <SPAN class="param-title">attrIndex</SPAN>          )       :    int
  +       <LI>
  +        <SPAN class="method-title">getEntityName</SPAN>      (   int
  +         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  +        class="param-title">entityIndex</SPAN>          )       :
  +         <SPAN class="class-title">String</SPAN>
          <LI>
  -        <SPAN class="method-title">endConditional</SPAN>      (
  -        )
  +        <SPAN class="method-title">getEntityOffset</SPAN>      (   int
  +         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  +        class="param-title">entityIndex</SPAN>          )       :    int
          <LI>
  -        <SPAN class="method-title">endDTD</SPAN>      (             )
  +        <SPAN class="method-title">getEntityLength</SPAN>      (   int
  +         <SPAN class="param-title">attrIndex</SPAN>, int <SPAN
  +        class="param-title">entityIndex</SPAN>          )       :    int
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  +  <H3>Implementation: Core Components</H3>
     <BLOCKQUOTE>
  -   <A name="XMLDTDContentModelSource"><DL class="interface">
  -     <DT>interface <SPAN class="interface-title">XMLDTDContentModelSource</SPAN>
  +   <A name="XMLDocumentScanner"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLDocumentScanner</SPAN>
  +     <DD class="implements">      implements      <SPAN
  +      class="interface-title">XMLComponent</SPAN>, <SPAN
  +      class="interface-title">XMLDocumentSource</SPAN>, <SPAN class="interface-title">XMLEntityHandler</SPAN>
  +     <DD class="fields">      fields:      <UL>
  +       <LI>
  +        <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
  +       <LI>
  +        <SPAN class="class-title">XMLErrorReporter</SPAN> <SPAN class="field-title">fErrorReporter</SPAN>
  +       <LI>
  +        <SPAN class="class-title">XMLEntityManager</SPAN> <SPAN class="field-title">fEntityManager</SPAN>
  +       <LI>
  +        <SPAN class="class-title">XMLDTDScanner</SPAN> <SPAN class="field-title">fDTDScanner</SPAN>
  +       <LI>boolean <SPAN class="field-title">fNamespaces</SPAN>
  +       <LI>
  +        <SPAN class="interface-title">XMLDocumentHandler</SPAN> <SPAN class="field-title">fDocumentHandler</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
  +       <LI>
  +        <SPAN class="constructor-title">XMLDocumentScanner</SPAN>      (
  +        )
  +      </UL>
        <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="method-title">setDTDContentModelHandler</SPAN>
  -        (   <SPAN
  -        class="interface-title">XMLDTDContentModelHandler</SPAN> <SPAN
  -        class="param-title">dtdContentModelHandler</SPAN>          )
  +        <SPAN class="method-title">scanDocument</SPAN>      (   boolean
  +         <SPAN class="param-title">complete</SPAN>          )       :    boolean
         </UL>
       </DL>
      </A></BLOCKQUOTE>
     <BLOCKQUOTE>
  -   <A name="XMLDTDContentModelHandler"><DL class="interface">
  -     <DT>interface <SPAN class="interface-title">XMLDTDContentModelHandler</SPAN>
  -     <DD class="constants">      constants:      <UL>
  -       <LI>short <SPAN class="constant-title">TYPE_EMPTY</SPAN>
  -       <LI>short <SPAN class="constant-title">TYPE_ANY</SPAN>
  -       <LI>short <SPAN class="constant-title">TYPE_MIXED</SPAN>
  -       <LI>short <SPAN class="constant-title">TYPE_CHILDREN</SPAN>
  -       <LI>short <SPAN class="constant-title">SEPARATOR_CHOICE</SPAN>
  -       <LI>short <SPAN class="constant-title">SEPARATOR_SEQUENCE</SPAN>
  -       <LI>short <SPAN class="constant-title">OCCURS_ZERO_OR_ONE</SPAN>
  -       <LI>short <SPAN class="constant-title">OCCURS_ZERO_OR_MORE</SPAN>
  -       <LI>short <SPAN class="constant-title">OCCURS_ONE_OR_MORE</SPAN>
  -      </UL>
  -     <DD class="methods">      methods:      <UL>
  +   <A name="XMLDTDScanner"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLDTDScanner</SPAN>
  +     <DD class="implements">      implements      <SPAN
  +      class="interface-title">XMLComponent</SPAN>, <SPAN
  +      class="interface-title">XMLDTDSource</SPAN>, <SPAN
  +      class="interface-title">XMLDTDContentModelSource</SPAN>, <SPAN class="interface-title">XMLEntityHandler</SPAN>
  +     <DD class="fields">      fields:      <UL>
          <LI>
  -        <SPAN class="method-title">startContentModel</SPAN>      (
  -         <SPAN class="class-title">String</SPAN> <SPAN
  -        class="param-title">elementName</SPAN>, short <SPAN
  -        class="param-title">type</SPAN>          )
  +        <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
          <LI>
  -        <SPAN class="method-title">mixedElement</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">elementName</SPAN>          )
  +        <SPAN class="class-title">XMLErrorReporter</SPAN> <SPAN class="field-title">fErrorReporter</SPAN>
          <LI>
  -        <SPAN class="method-title">childrenStartGroup</SPAN>      (
  -        )
  +        <SPAN class="class-title">XMLEntityManager</SPAN> <SPAN class="field-title">fEntityManager</SPAN>
          <LI>
  -        <SPAN class="method-title">childrenElement</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">elementName</SPAN>          )
  +        <SPAN class="class-title">GrammarPool</SPAN> <SPAN class="field-title">fGrammarPool</SPAN>
          <LI>
  -        <SPAN class="method-title">childrenSeparator</SPAN>      (
  -        short <SPAN class="param-title">separator</SPAN>          )
  +        <SPAN class="interface-title">XMLDTDHandler</SPAN> <SPAN class="field-title">fDTDHandler</SPAN>
          <LI>
  -        <SPAN class="method-title">childrenOccurrence</SPAN>      (
  -        short <SPAN class="param-title">occurrence</SPAN>          )
  +        <SPAN class="interface-title">XMLDTDContentModelHandler</SPAN>
  +         <SPAN class="field-title">fDTDContentModelHandler</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
          <LI>
  -        <SPAN class="method-title">childrenEndGroup</SPAN>      (
  +        <SPAN class="constructor-title">XMLDTDScanner</SPAN>      (
           )
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="method-title">endContentModel</SPAN>      (
  -        )
  +        <SPAN class="method-title">scanDTD</SPAN>      (   boolean <SPAN
  +        class="param-title">complete</SPAN>          )       :    boolean
  +       <LI>
  +        <SPAN class="method-title">scanDTDFragment</SPAN>      (
  +        boolean <SPAN class="param-title">complete</SPAN>          )
  +        :    boolean
  +       <LI>
  +        <SPAN class="method-title">scanDTDInternalSubset</SPAN>      (
  +        boolean <SPAN class="param-title">complete</SPAN>          )
  +        :    boolean
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  -  <H3>Reading</H3>
     <BLOCKQUOTE>
      <A name="XMLEntityManager"><DL class="class">
        <DT>class <SPAN class="class-title">XMLEntityManager</SPAN>
  @@ -621,6 +595,8 @@
           <SPAN class="interface-title">EntityResolver</SPAN> <SPAN class="field-title">fEntityResolver</SPAN>
          <LI>
           <SPAN class="class-title">XMLEntityScanner</SPAN> <SPAN class="field-title">fEntityReader</SPAN>
  +       <LI>
  +        <SPAN class="interface-title">XMLEntityHandler</SPAN> <SPAN class="field-title">fEntityHandler</SPAN>
         </UL>
        <DD class="constructors">      constructors:      <UL>
          <LI>
  @@ -629,6 +605,10 @@
         </UL>
        <DD class="methods">      methods:      <UL>
          <LI>
  +        <SPAN class="method-title">setEntityHandler</SPAN>      (
  +         <SPAN class="interface-title">XMLEntityHandler</SPAN> <SPAN
  +        class="param-title">entityHandler</SPAN>          )
  +       <LI>
           <SPAN class="method-title">addGeneralEntity</SPAN>      (
            <SPAN class="class-title">String</SPAN> <SPAN
           class="param-title">name</SPAN>, <SPAN
  @@ -678,7 +658,11 @@
            <SPAN class="class-title">String</SPAN> <SPAN
           class="param-title">entityName</SPAN>          )
          <LI>
  -        <SPAN class="method-title">startEntity</SPAN>      (   <SPAN
  +        <SPAN class="method-title">startDocumentEntity</SPAN>      (
  +         <SPAN class="class-title">InputSource</SPAN> <SPAN
  +        class="param-title">inputSource</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">startDTDEntity</SPAN>      (   <SPAN
           class="class-title">InputSource</SPAN> <SPAN
           class="param-title">inputSource</SPAN>          )
          <LI>
  @@ -691,35 +675,8 @@
      <A name="XMLEntityScanner"><DL class="class">
        <DT>class <SPAN class="class-title">XMLEntityScanner</SPAN>
        <DD class="implements">      implements      <SPAN class="interface-title">Locator</SPAN>
  -     <DD class="fields">      fields:      <UL>
  -       <LI>
  -        <SPAN class="interface-title">XMLEntityHandler</SPAN> <SPAN class="field-title">fEntityHandler</SPAN>
  -       <LI>
  -        <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
  -       <LI>
  -        <SPAN class="class-title">InputSource</SPAN> <SPAN class="field-title">fInputSource</SPAN>
  -       <LI>int <SPAN class="field-title">fLineNumber</SPAN>
  -       <LI>int <SPAN class="field-title">fColumnNumber</SPAN>
  -       <LI>long <SPAN class="field-title">fBytePosition</SPAN>
  -       <LI>long <SPAN class="field-title">fCharPosition</SPAN>
  -      </UL>
  -     <DD class="constructors">      constructors:      <UL>
  -       <LI>
  -        <SPAN class="constructor-title">XMLEntityScanner</SPAN>      (
  -        )
  -      </UL>
        <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="method-title">setEntityHandler</SPAN>      (
  -         <SPAN class="interface-title">XMLEntityHandler</SPAN> <SPAN
  -        class="param-title">entityHandler</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">getBytePosition</SPAN>      (
  -        )       :    long
  -       <LI>
  -        <SPAN class="method-title">getCharPosition</SPAN>      (
  -        )       :    long
  -       <LI>
           <SPAN class="method-title">peekChar</SPAN>      (             )
           :    int
          <LI>
  @@ -738,12 +695,12 @@
          <LI>
           <SPAN class="method-title">scanContent</SPAN>      (   <SPAN
           class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">content</SPAN>          )       :    boolean
  +        class="param-title">content</SPAN>          )       :    int
          <LI>
           <SPAN class="method-title">scanAttContent</SPAN>      (   int
            <SPAN class="param-title">quote</SPAN>, <SPAN
           class="class-title">XMLString</SPAN> <SPAN
  -        class="param-title">content</SPAN>          )       :    boolean
  +        class="param-title">content</SPAN>          )       :    int
          <LI>
           <SPAN class="method-title">scanData</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
  @@ -751,6 +708,9 @@
           class="class-title">XMLString</SPAN> <SPAN
           class="param-title">data</SPAN>          )       :    boolean
          <LI>
  +        <SPAN class="method-title">skipChar</SPAN>      (   int <SPAN
  +        class="param-title">c</SPAN>          )       :    boolean
  +       <LI>
           <SPAN class="method-title">skipSpaces</SPAN>      (
           )       :    boolean
          <LI>
  @@ -761,31 +721,10 @@
       </DL>
      </A></BLOCKQUOTE>
     <BLOCKQUOTE>
  -   <A name="XMLEntityHandler"><DL class="interface">
  -     <DT>interface <SPAN class="interface-title">XMLEntityHandler</SPAN>
  -     <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">startEntity</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">name</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">publicId</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">systemId</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">endEntity</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">name</SPAN>          )
  -      </UL>
  -    </DL>
  -   </A></BLOCKQUOTE>
  -  <H3>Validating</H3>
  -  <BLOCKQUOTE>
      <A name="XMLValidator"><DL class="class">
        <DT>class <SPAN class="class-title">XMLValidator</SPAN>
        <DD class="implements">      implements      <SPAN
  -      class="interface-title">XMLComponent</SPAN>, <SPAN
  -      class="interface-title">XMLDocumentSource</SPAN>, <SPAN class="interface-title">XMLDocumentHandler</SPAN>
  +      class="interface-title">XMLComponent</SPAN>, <SPAN class="interface-title">XMLDocumentFilter</SPAN>
        <DD class="fields">      fields:      <UL>
          <LI>
           <SPAN class="class-title">SymbolTable</SPAN> <SPAN class="field-title">fSymbolTable</SPAN>
  @@ -806,6 +745,7 @@
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  +  <H3>Implementation: Validation</H3>
     <BLOCKQUOTE>
      <A name="GrammarPool"><DL class="class">
        <DT>class <SPAN class="class-title">GrammarPool</SPAN>
  @@ -1202,7 +1142,7 @@
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  -  <H3>Validating: Content Models</H3>
  +  <H3>Implementation: Validation Content Models</H3>
     <BLOCKQUOTE>
      <A name="SimpleContentModel"><DL class="class">
        <DT>class <SPAN class="class-title">SimpleContentModel</SPAN>
  @@ -1260,7 +1200,7 @@
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  -  <H3>Validating: Datatypes</H3>
  +  <H3>Implementation: Validation Datatypes</H3>
     <BLOCKQUOTE>
      <A name="DatatypeValidatorFactoryImpl"><DL class="class">
        <DT>class <SPAN class="class-title">DatatypeValidatorFactoryImpl</SPAN>
  @@ -1310,7 +1250,7 @@
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  -  <H3>Validating: Grammars</H3>
  +  <H3>Implementation: Validation Grammars</H3>
     <BLOCKQUOTE>
      <A name="DTDGrammar"><DL class="class">
        <DT>class <SPAN class="class-title">DTDGrammar</SPAN>
  @@ -1613,36 +1553,21 @@
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  -  <H3>Utils</H3>
  +  <H3>Utility Interfaces and Classes</H3>
     <BLOCKQUOTE>
      <A name="XMLChar"><DL class="class">
        <DT>class <SPAN class="class-title">XMLChar</SPAN>
        <DD class="constants">      constants:      <UL>
          <LI>byte[]   <SPAN class="constant-title">CHARS</SPAN>
          <LI>byte <SPAN class="constant-title">MASK_VALID</SPAN>
  -       <LI>byte <SPAN class="constant-title">MASK_LETTER</SPAN>
  -       <LI>byte <SPAN class="constant-title">MASK_COMBINING_CHAR</SPAN>
  -       <LI>byte <SPAN class="constant-title">MASK_DIGIT</SPAN>
  -       <LI>byte <SPAN class="constant-title">MASK_EXTENDER</SPAN>
          <LI>byte <SPAN class="constant-title">MASK_SPACE</SPAN>
          <LI>byte <SPAN class="constant-title">MASK_NAME_START</SPAN>
          <LI>byte <SPAN class="constant-title">MASK_NAME</SPAN>
  +       <LI>byte <SPAN class="constant-title">MASK_PUBID</SPAN>
         </UL>
        <DD class="methods">      methods:      <UL>
  -       <LI>
  -        <SPAN class="method-title">isValid</SPAN>      (   char <SPAN
  -        class="param-title">c</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">isLetter</SPAN>      (   char <SPAN
  -        class="param-title">c</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">isCombiningChar</SPAN>      (   char
  -         <SPAN class="param-title">c</SPAN>          )       :    boolean
  -       <LI>
  -        <SPAN class="method-title">isDigit</SPAN>      (   char <SPAN
  -        class="param-title">c</SPAN>          )       :    boolean
          <LI>
  -        <SPAN class="method-title">isExtender</SPAN>      (   char <SPAN
  +        <SPAN class="method-title">isValid</SPAN>      (   int <SPAN
           class="param-title">c</SPAN>          )       :    boolean
          <LI>
           <SPAN class="method-title">isSpace</SPAN>      (   char <SPAN
  @@ -1653,6 +1578,9 @@
          <LI>
           <SPAN class="method-title">isName</SPAN>      (   char <SPAN
           class="param-title">c</SPAN>          )       :    boolean
  +       <LI>
  +        <SPAN class="method-title">isPubid</SPAN>      (   char <SPAN
  +        class="param-title">c</SPAN>          )       :    boolean
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  @@ -1740,31 +1668,58 @@
       </DL>
      </A></BLOCKQUOTE>
     <BLOCKQUOTE>
  -   <A name="QName"><DL class="class">
  -     <DT>class <SPAN class="class-title">QName</SPAN>
  +   <A name="XMLErrorReporter"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLErrorReporter</SPAN>
  +     <DD class="implements">      implements      <SPAN class="interface-title">XMLComponent</SPAN>
  +     <DD class="constants">      constants:      <UL>
  +       <LI>short <SPAN class="constant-title">SEVERITY_WARNING</SPAN>
  +       <LI>short <SPAN class="constant-title">SEVERITY_ERROR</SPAN>
  +       <LI>short <SPAN class="constant-title">SEVERITY_FATAL_ERROR</SPAN>
  +      </UL>
        <DD class="fields">      fields:      <UL>
          <LI>
  -        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">prefix</SPAN>
  +        <SPAN class="class-title">Locale</SPAN> <SPAN class="field-title">fLocale</SPAN>
          <LI>
  -        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">localpart</SPAN>
  +        <SPAN class="class-title">Hashtable</SPAN>      &lt;   <SPAN
  +        class="interface-title">MessageFormatter</SPAN>      &gt;
  +         <SPAN class="field-title">fMessageFormatters</SPAN>
          <LI>
  -        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">rawname</SPAN>
  +        <SPAN class="interface-title">ErrorHandler</SPAN> <SPAN class="field-title">fErrorHandler</SPAN>
  +       <LI>boolean <SPAN class="field-title">fContinueAfterFatalError</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
          <LI>
  -        <SPAN class="class-title">String</SPAN> <SPAN class="field-title">uri</SPAN>
  +        <SPAN class="constructor-title">XMLErrorReporter</SPAN>      (
  +        )
         </UL>
        <DD class="methods">      methods:      <UL>
          <LI>
  -        <SPAN class="method-title">setValues</SPAN>      (   <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">prefix</SPAN>, <SPAN
  -        class="class-title">String</SPAN> <SPAN
  -        class="param-title">localpart</SPAN>, <SPAN
  +        <SPAN class="method-title">setLocale</SPAN>      (   <SPAN
  +        class="class-title">Locale</SPAN> <SPAN
  +        class="param-title">locale</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">putMessageFormatter</SPAN>      (
  +         <SPAN class="class-title">String</SPAN> <SPAN
  +        class="param-title">domain</SPAN>, <SPAN
  +        class="interface-title">MessageFormatter</SPAN> <SPAN
  +        class="param-title">messageFormatter</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">getMessageFormatter</SPAN>      (
  +         <SPAN class="class-title">String</SPAN> <SPAN
  +        class="param-title">domain</SPAN>          )       :    <SPAN class="interface-title">MessageFormatter</SPAN>
  +       <LI>
  +        <SPAN class="method-title">removeMessageFormatter</SPAN>      (
  +         <SPAN class="class-title">String</SPAN> <SPAN
  +        class="param-title">domain</SPAN>          )       :    <SPAN class="interface-title">MessageFormatter</SPAN>
  +       <LI>
  +        <SPAN class="method-title">reportError</SPAN>      (   <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">rawname</SPAN>, <SPAN
  +        class="param-title">domain</SPAN>, <SPAN
           class="class-title">String</SPAN> <SPAN
  -        class="param-title">uri</SPAN>          )
  -       <LI>
  -        <SPAN class="method-title">clear</SPAN>      (             )
  +        class="param-title">key</SPAN>, <SPAN
  +        class="class-title">Object</SPAN>[]   <SPAN
  +        class="param-title">arguments</SPAN>, short <SPAN
  +        class="param-title">severity</SPAN>          )
         </UL>
       </DL>
      </A></BLOCKQUOTE>
  @@ -1781,6 +1736,43 @@
           class="class-title">Object</SPAN>[]   <SPAN
           class="param-title">arguments</SPAN>          )       :    <SPAN class="class-title">String</SPAN>
         </UL>
  +    </DL>
  +   </A></BLOCKQUOTE>
  +  <BLOCKQUOTE>
  +   <A name="XMLStringBuffer"><DL class="class">
  +     <DT>class <SPAN class="class-title">XMLStringBuffer</SPAN>
  +     <DD class="extends">      extends      <SPAN class="class-title">XMLString</SPAN>
  +     <DD class="constants">      constants:      <UL>
  +       <LI>int <SPAN class="constant-title">DEFAULT_SIZE</SPAN>
  +      </UL>
  +     <DD class="constructors">      constructors:      <UL>
  +       <LI>
  +        <SPAN class="constructor-title">XMLStringBuffer</SPAN>      (
  +        )
  +       <LI>
  +        <SPAN class="constructor-title">XMLStringBuffer</SPAN>      (
  +        int <SPAN class="param-title">size</SPAN>          )
  +      </UL>
  +     <DD class="methods">      methods:      <UL>
  +       <LI>
  +        <SPAN class="method-title">clear</SPAN>      (             )
  +       <LI>
  +        <SPAN class="method-title">append</SPAN>      (   char <SPAN
  +        class="param-title">c</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">append</SPAN>      (   <SPAN
  +        class="class-title">String</SPAN> <SPAN
  +        class="param-title">s</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">append</SPAN>      (   char[]   <SPAN
  +        class="param-title">ch</SPAN>, int <SPAN
  +        class="param-title">offset</SPAN>, int <SPAN
  +        class="param-title">length</SPAN>          )
  +       <LI>
  +        <SPAN class="method-title">append</SPAN>      (   <SPAN
  +        class="class-title">XMLString</SPAN> <SPAN
  +        class="param-title">s</SPAN>          )
  +      </UL>
       </DL>
  -   </A></BLOCKQUOTE>          Last modified: $Date: 2000/09/27 18:58:09 $</BODY>
  +   </A></BLOCKQUOTE>          Last modified: $Date: 2000/10/02 00:16:12 $</BODY>
   </HTML>
  
  
  
  1.1.2.7   +345 -305  xml-xerces/java/design/Attic/design.zip
  
  	<<Binary file>>
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -3      xml-xerces/java/design/xml/Attic/design.dtd
  
  Index: design.dtd
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/design/xml/Attic/design.dtd,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- design.dtd	2000/09/15 21:57:17	1.1.2.1
  +++ design.dtd	2000/10/02 00:16:21	1.1.2.2
  @@ -1,9 +1,10 @@
   <?xml encoding='US-ASCII'?>
  -<!-- $Id: design.dtd,v 1.1.2.1 2000/09/15 21:57:17 andyc Exp $ -->
  +<!-- $Id: design.dtd,v 1.1.2.2 2000/10/02 00:16:21 andyc Exp $ -->
   
   <!-- overall organization -->
  -<!ELEMENT design (date?,note*,types*,category*)>
  -<!ATTLIST design name CDATA #IMPLIED>
  +<!ELEMENT design (note*,types*,category*)>
  +<!ATTLIST design name CDATA #IMPLIED
  +                 date CDATA #IMPLIED>
   <!ELEMENT date (#PCDATA)>
   <!ELEMENT types (category)*>
   <!ELEMENT category (note*,(class|interface)*)>
  
  
  
  1.1.2.6   +692 -660  xml-xerces/java/design/xml/Attic/design.xml
  
  Index: design.xml
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/design/xml/Attic/design.xml,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- design.xml	2000/09/29 03:19:21	1.1.2.5
  +++ design.xml	2000/10/02 00:16:21	1.1.2.6
  @@ -1,10 +1,9 @@
   <?xml version='1.0' encoding='US-ASCII'?>
  -<!-- $Id: design.xml,v 1.1.2.5 2000/09/29 03:19:21 andyc Exp $ -->
  +<!-- $Id: design.xml,v 1.1.2.6 2000/10/02 00:16:21 andyc Exp $ -->
   <!DOCTYPE design SYSTEM 'design.dtd' [
   <!ENTITY package 'org.apache.xerces'>
   ]>
  -<design name='Xerces-J 2.0'>
  - <date>$Date: 2000/09/29 03:19:21 $</date>
  +<design name='Xerces-J 2.0' date='$Date: 2000/10/02 00:16:21 $'>
   
    <!-- TYPES -->
    <types>
  @@ -239,9 +238,9 @@
     </category>
    </types>
   
  - <!-- Category: BASE -->
  - <category name='Base' package='&package;.framework'>
  -
  + <!-- Category: XNI -->
  + <category name='Xerces Native Interface (XNI)' package='&package;.xni'>
  +  
     <interface id='configurable' name='XMLComponent'>
      <method name='reset'>
       <param name='componentManager'>
  @@ -312,322 +311,220 @@
      </method>
     </interface>
   
  -  <class id='string' name='XMLString'>
  -   <field name='ch' visibility='public'>
  -    <array>
  -     <primitive type='char'/>
  -    </array>
  -   </field>
  -   <field name='offset' visibility='public'>
  -    <primitive type='int'/>
  -   </field>
  -   <field name='length' visibility='public'>
  -    <primitive type='int'/>
  -   </field>
  -   <constructor/>
  -   <constructor>
  -    <param name='ch'>
  -     <array>
  -      <primitive type='char'/>
  -     </array>
  -    </param>
  -    <param name='offset'>
  -     <primitive type='int'/>
  -    </param>
  -    <param name='length'>
  -     <primitive type='int'/>
  -    </param>
  -   </constructor>
  -   <method name='setValues'>
  -    <param name='ch'>
  -     <array>
  -      <primitive type='char'/>
  -     </array>
  -    </param>
  -    <param name='offset'>
  -     <primitive type='int'/>
  -    </param>
  -    <param name='length'>
  -     <primitive type='int'/>
  +  <interface id='entity-handler' name='XMLEntityHandler'>
  +   <method name='startEntity'>
  +    <param name='name'>
  +     <note>
  +      The document has the pseudo-name of "[xml]", the DTD has the
  +      pseudo-name of "[dtd]; parameter entity names start with '%';
  +      and general entities are just specified by their name.
  +     </note>
  +     <reference idref='java-string'/>
       </param>
  -   </method>
  -   <method name='clear'/>
  -   <method name='equals'>
  -    <param name='ch'>
  -     <array>
  -      <primitive type='char'/>
  -     </array>
  +    <param name='publicId'>
  +     <reference idref='java-string'/>
       </param>
  -    <param name='offset'>
  -     <primitive type='int'/>
  +    <param name='systemId'>
  +     <reference idref='java-string'/>
       </param>
  -    <param name='length'>
  -     <primitive type='int'/>
  +    <param name='encoding'>
  +     <note>
  +      The auto-detected encoding of the entity or null if not appropriate. 
  +      The encoding name will be specified using the IANA encoding name.
  +     </note>
  +     <reference idref='java-string'/>
       </param>
  -    <returns>
  -     <primitive type='boolean'/>
  -    </returns>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='equals'>
  -    <param name='s'>
  +   <method name='endEntity'>
  +    <param name='name'>
        <reference idref='java-string'/>
       </param>
  -    <returns>
  -     <primitive type='boolean'/>
  -    </returns>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='toString'>
  -    <returns>
  -     <reference idref='java-string'/>
  -    </returns>
  +  </interface>
  +
  +  <interface id='document-source' name='XMLDocumentSource'>
  +   <method name='setDocumentHandler'>
  +    <param name='documentHandler'>
  +     <reference idref='document-handler'/>
  +    </param>
      </method>
  -  </class>
  -  
  -  <class id='string-buffer' name='XMLStringBuffer'>
  +  </interface>
  +
  +  <interface id='document-handler' name='XMLDocumentHandler'>
      <extends>
  -    <reference idref='string'/>
  +    <reference idref='entity-handler'/>
      </extends>
  -   <constant name='DEFAULT_SIZE'>
  -    <primitive type='int'/>
  -   </constant>
  -   <constructor/>
  -   <constructor>
  -    <param name='size'>
  -     <primitive type='int'/>
  +   <method name='startDocument'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='xmlDecl'>
  +    <param name='version'>
  +     <reference idref='java-string'/>
       </param>
  -   </constructor>
  -   <method name='clear'/>
  -   <method name='append'>
  -    <param name='c'>
  -     <primitive type='char'/>
  +    <param name='encoding'>
  +     <reference idref='java-string'/>
       </param>
  -   </method>
  -   <method name='append'>
  -    <param name='s'>
  +    <param name='standalone'>
        <reference idref='java-string'/>
       </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='append'>
  -    <param name='ch'>
  -     <array>
  -      <primitive type='char'/>
  -     </array>
  +   <method name='doctypeDecl'>
  +    <param name='rootElement'>
  +     <reference idref='java-string'/>    
       </param>
  -    <param name='offset'>
  -     <primitive type='int'/>
  +    <param name='publicId'>
  +     <reference idref='java-string'/>
       </param>
  -    <param name='length'>
  -     <primitive type='int'/>
  +    <param name='systemId'>
  +     <reference idref='java-string'/>
       </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='append'>
  -    <param name='s'>
  +   <method name='comment'>
  +    <param name='text'>
        <reference idref='string'/>
  -    </param>
  -   </method>
  -  </class>
  -
  - </category>
  -
  - <!-- Category: ERROR HANDLING -->
  - <category name='Error Handling' package='&package;.framework'>
  -
  -  <class id='error-reporter' name='XMLErrorReporter'>
  -   <implements>
  -    <reference idref='configurable'/>
  -   </implements>
  -   <constant name='SEVERITY_WARNING'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='SEVERITY_ERROR'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='SEVERITY_FATAL_ERROR'>
  -    <primitive type='short'/>
  -   </constant>
  -   <field name='fLocale'>
  -    <reference idref='java-locale'/>
  -   </field>
  -   <field name='fMessageFormatters'>
  -    <collection>
  -     <collector>
  -      <reference idref='java-hashtable'/>
  -     </collector>
  -     <items>
  -      <reference idref='message-formatter'/>
  -     </items>
  -    </collection>
  -   </field>
  -   <field name='fErrorHandler'>
  -    <reference idref='sax-error-handler'/>
  -   </field>
  -   <field name='fContinueAfterFatalError'>
  -    <note>This field is initialized on reset.</note>
  -    <primitive type='boolean'/>
  -   </field>
  -   <constructor/>
  -   <method name='setLocale'>
  -    <param name='locale'>
  -     <reference idref='java-locale'/>
       </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='putMessageFormatter'>
  -    <param name='domain'>
  +   <method name='processingInstruction'>
  +    <param name='target'>
        <reference idref='java-string'/>
       </param>
  -    <param name='messageFormatter'>
  -     <reference idref='message-formatter'/>
  +    <param name='data'>
  +     <reference idref='string'/>
       </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='getMessageFormatter'>
  -    <param name='domain'>
  +   <method name='startPrefixMapping'>
  +    <param name='prefix'>
        <reference idref='java-string'/>
       </param>
  -    <returns>
  -     <reference idref='message-formatter'/>
  -    </returns>
  -   </method>
  -   <method name='removeMessageFormatter'>
  -    <param name='domain'>
  +    <param name='uri'>
        <reference idref='java-string'/>
       </param>
  -    <returns>
  -     <reference idref='message-formatter'/>
  -    </returns>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='reportError'>
  -    <param name='domain'>
  -     <reference idref='java-string'/>
  +   <method name='startElement'>
  +    <param name='element'>
  +     <reference idref='qname'/>
       </param>
  -    <param name='key'>
  -     <reference idref='java-string'/>
  +    <param name='attributes'>
  +     <reference idref='attributes'/>
       </param>
  -    <param name='arguments'>
  -     <array>
  -      <reference idref='java-object'/>
  -     </array>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='characters'>
  +    <param name='text'>
  +     <reference idref='string'/>
       </param>
  -    <param name='severity'>
  -     <primitive type='short'/>
  +    <param name='whitespace'>
  +     <primitive type='boolean'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -  </class>
  -
  - </category>
  -
  - <!-- Category: SCANNING -->
  - <category name='Scanning' package='&package;.scanners'>
  -
  -  <class id='document-scanner' name='XMLDocumentScanner'>
  -   <implements>
  -    <reference idref='configurable'/>
  -   </implements>
  -   <implements>
  -    <reference idref='document-source'/>
  -   </implements>
  -   <field name='fSymbolTable'>
  -    <note>This field is initialized on reset.</note>
  -    <reference idref='symbol-table'/>
  -   </field>
  -   <field name='fErrorReporter'>
  -    <note>This field is initialized on reset.</note>
  -    <reference idref='error-reporter'/>
  -   </field>
  -   <field name='fEntityManager'>
  -    <note>This field is initialized on reset.</note>
  -    <reference idref='entity-manager'/>
  -   </field>
  -   <field name='fDTDScanner'>
  -    <note>This field is initialized on reset.</note>
  -    <reference idref='dtd-scanner'/>
  -   </field>
  -   <field name='fNamespaces'>
  -    <note>This field is initialized on reset.</note>
  -    <primitive type='boolean'/>
  -   </field>
  -   <field name='fDocumentHandler'>
  -    <reference idref='document-handler'/>
  -   </field>
  -   <constructor/>
  -   <method name='scanDocument'>
  -    <param name='complete'>
  -     <primitive type='boolean'/>
  +   <method name='ignorableWhitespace'>
  +    <param name='text'>
  +     <reference idref='string'/>
       </param>
  -    <returns>
  -     <primitive type='boolean'/>
  -    </returns>
       <throws>
  -     <reference idref='java-io-exception'/>
  +     <reference idref='sax-exception'/>
       </throws>
  +   </method>
  +   <method name='endElement'>
  +    <param name='element'>
  +     <reference idref='qname'/>
  +    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <!-- REVISIT: Document fragment scanning.
  -   <method name='scanDocumentFragment'>
  -    <param name='complete'>
  -     <primitive type='boolean'/>
  +   <method name='endPrefixMapping'>
  +    <param name='prefix'>
  +     <reference idref='java-string'/>
       </param>
  -    <returns>
  -     <primitive type='boolean'/>
  -    </returns>
       <throws>
  -     <reference idref='java-io-exception'/>
  +     <reference idref='sax-exception'/>
       </throws>
  +   </method>
  +   <method name='startCDATA'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
  -   </method>
  -   -->
  -  </class>
  -
  -  <interface id='document-source' name='XMLDocumentSource'>
  -   <method name='setDocumentHandler'>
  -    <param name='documentHandler'>
  -     <reference idref='document-handler'/>
  -    </param>
      </method>
  -  </interface>
  -
  -  <interface id='document-handler' name='XMLDocumentHandler'>
  -   <extends>
  -    <reference idref='entity-handler'/>
  -   </extends>
  -   <method name='startDocument'>
  +   <method name='endCDATA'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
  -   </method>
  -   <method name='xmlDecl'>
  +   </method>   
  +   <method name='textDecl'>
       <param name='version'>
        <reference idref='java-string'/>
       </param>
       <param name='encoding'>
        <reference idref='java-string'/>
       </param>
  -    <param name='actualEncoding'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='standalone'>
  -     <reference idref='java-string'/>
  -    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='doctypeDecl'>
  -    <param name='rootElement'>
  -     <reference idref='java-string'/>    
  -    </param>
  -    <param name='publicId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='systemId'>
  -     <reference idref='java-string'/>
  +   <method name='endDocument'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +  </interface>
  +
  +  <interface id='document-filter' name='XMLDocumentFilter'>
  +   <extends>
  +    <reference idref='document-handler'/>
  +   </extends>
  +   <extends>
  +    <reference idref='document-source'/>
  +   </extends>
  +  </interface>
  +
  +  <interface id='dtd-source' name='XMLDTDSource'>
  +   <method name='setDTDHandler'>
  +    <param name='dtdHandler'>
  +     <reference idref='dtd-handler'/>
       </param>
  +   </method>
  +  </interface>
  +
  +  <interface id='dtd-handler' name='XMLDTDHandler'>
  +   <extends>
  +    <reference idref='entity-handler'/>
  +   </extends>
  +   <constant name='CONDITIONAL_INCLUDE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='CONDITIONAL_IGNORE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <method name='startDTD'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
  @@ -651,96 +548,382 @@
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='startPrefixMapping'>
  -    <param name='prefix'>
  +   <method name='startExternalSubset'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='endExternalSubset'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='elementDecl'>
  +    <param name='name'>
        <reference idref='java-string'/>
       </param>
  -    <param name='uri'>
  +    <param name='contentModel'>
  +     <reference idref='string'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='startAttlist'>
  +    <param name='elementName'>
        <reference idref='java-string'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='startElement'>
  -    <param name='element'>
  -     <reference idref='qname'/>
  +   <method name='attributeDecl'>
  +    <param name='elementName'>
  +     <reference idref='java-string'/>
       </param>
  -    <param name='attributes'>
  -     <reference idref='attributes'/>
  +    <param name='attributeName'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='type'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='enumeration'>
  +     <array>
  +      <reference idref='java-string'/>
  +     </array>
  +    </param>
  +    <param name='defaultType'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='defaultValue'>
  +     <reference idref='string'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='characters'>
  +   <method name='endAttlist'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='internalEntityDecl'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
       <param name='text'>
        <reference idref='string'/>
       </param>
  -    <param name='whitespace'>
  +    <param name='isPE'>
        <primitive type='boolean'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='ignorableWhitespace'>
  -    <param name='text'>
  -     <reference idref='string'/>
  +   <method name='externalEntityDecl'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='publicId'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='systemId'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='isPE'>
  +     <primitive type='boolean'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='endElement'>
  -    <param name='element'>
  -     <reference idref='qname'/>
  +   <method name='unparsedEntityDecl'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='publicId'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='systemId'>
  +     <reference idref='java-string'/>
       </param>
  +    <param name='notation'>
  +     <reference idref='java-string'/>
  +    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='endPrefixMapping'>
  -    <param name='prefix'>
  +   <method name='notationDecl'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='publicId'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='systemId'>
        <reference idref='java-string'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='startCDATA'>
  +   <!-- REVISIT: How do we handle these?
  +   <method name='startParameterEntity'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='endCDATA'>
  +   <method name='endParameterEntity'>
  +    <param name='name'>
  +     <reference idref='java-string'/>
  +    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
  -   </method>   
  -   <method name='textDecl'>
  -    <param name='version'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='encoding'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='actualEncoding'>
  -     <reference idref='java-string'/>
  +   </method>
  +   -->
  +   <method name='startConditional'>
  +    <param name='type'>
  +     <primitive type='short'/>
       </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='endDocument'>
  +   <method name='endConditional'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -  </interface>
  -
  -  <class id='attributes' name='XMLAttributes'>
  -   <implements>
  +   <method name='endDTD'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +  </interface>
  +
  +  <interface id='dtd-filter' name='XMLDTDFilter'>
  +   <extends>
  +    <reference idref='dtd-handler'/>
  +   </extends>
  +   <extends>
  +    <reference idref='dtd-source'/>
  +   </extends>
  +  </interface>
  +
  +  <interface id='dtd-content-model-source' name='XMLDTDContentModelSource'>
  +   <method name='setDTDContentModelHandler'>
  +    <param name='dtdContentModelHandler'>
  +     <reference idref='dtd-content-model-handler'/>
  +    </param>
  +   </method>
  +  </interface>
  +
  +  <interface id='dtd-content-model-handler' name='XMLDTDContentModelHandler'>
  +   <constant name='TYPE_EMPTY'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='TYPE_ANY'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='TYPE_MIXED'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='TYPE_CHILDREN'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='SEPARATOR_CHOICE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='SEPARATOR_SEQUENCE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='OCCURS_ZERO_OR_ONE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='OCCURS_ZERO_OR_MORE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='OCCURS_ONE_OR_MORE'>
  +    <primitive type='short'/>
  +   </constant>
  +   <method name='startContentModel'>
  +    <param name='elementName'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='type'>
  +     <primitive type='short'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='mixedElement'>
  +    <param name='elementName'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='childrenStartGroup'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='childrenElement'>
  +    <param name='elementName'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='childrenSeparator'>
  +    <param name='separator'>
  +     <primitive type='short'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='childrenOccurrence'>
  +    <param name='occurrence'>
  +     <primitive type='short'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='childrenEndGroup'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +   <method name='endContentModel'>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
  +   </method>
  +  </interface>
  +
  +  <interface id='dtd-content-model-filter' name='XMLDTDContentModelFilter'>
  +   <extends>
  +    <reference idref='dtd-content-model-handler'/>
  +   </extends>
  +   <extends>
  +    <reference idref='dtd-content-model-source'/>
  +   </extends>
  +  </interface>
  +
  +  <class id='qname' name='QName'>
  +   <field name='prefix' visibility='public'>
  +    <reference idref='java-string'/>
  +   </field>
  +   <field name='localpart' visibility='public'>
  +    <reference idref='java-string'/>
  +   </field>
  +   <field name='rawname' visibility='public'>
  +    <reference idref='java-string'/>
  +   </field>
  +   <field name='uri' visibility='public'>
  +    <reference idref='java-string'/>
  +   </field>
  +   <method name='setValues'>
  +    <param name='prefix'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='localpart'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='rawname'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='uri'>
  +     <reference idref='java-string'/>
  +    </param>
  +   </method>
  +   <method name='clear'/>
  +  </class>
  +
  +  <class id='string' name='XMLString'>
  +   <field name='ch' visibility='public'>
  +    <array>
  +     <primitive type='char'/>
  +    </array>
  +   </field>
  +   <field name='offset' visibility='public'>
  +    <primitive type='int'/>
  +   </field>
  +   <field name='length' visibility='public'>
  +    <primitive type='int'/>
  +   </field>
  +   <constructor/>
  +   <constructor>
  +    <param name='ch'>
  +     <array>
  +      <primitive type='char'/>
  +     </array>
  +    </param>
  +    <param name='offset'>
  +     <primitive type='int'/>
  +    </param>
  +    <param name='length'>
  +     <primitive type='int'/>
  +    </param>
  +   </constructor>
  +   <method name='setValues'>
  +    <param name='ch'>
  +     <array>
  +      <primitive type='char'/>
  +     </array>
  +    </param>
  +    <param name='offset'>
  +     <primitive type='int'/>
  +    </param>
  +    <param name='length'>
  +     <primitive type='int'/>
  +    </param>
  +   </method>
  +   <method name='clear'/>
  +   <method name='equals'>
  +    <param name='ch'>
  +     <array>
  +      <primitive type='char'/>
  +     </array>
  +    </param>
  +    <param name='offset'>
  +     <primitive type='int'/>
  +    </param>
  +    <param name='length'>
  +     <primitive type='int'/>
  +    </param>
  +    <returns>
  +     <primitive type='boolean'/>
  +    </returns>
  +   </method>
  +   <method name='equals'>
  +    <param name='s'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <returns>
  +     <primitive type='boolean'/>
  +    </returns>
  +   </method>
  +   <method name='toString'>
  +    <returns>
  +     <reference idref='java-string'/>
  +    </returns>
  +   </method>
  +  </class>
  +  
  +  <class id='attributes' name='XMLAttributes'>
  +   <implements>
       <reference idref='sax-attribute-list'/>
      </implements>
      <implements>
  @@ -893,15 +1076,20 @@
      </method>
     </class>
   
  -  <class id='dtd-scanner' name='XMLDTDScanner'>
  + </category>                                                   
  +
  + <!-- Category: XERCES IMPLEMENTATION -->
  + <category name='Implementation: Core Components' package='&package;.impl'>
  + 
  +  <class id='document-scanner' name='XMLDocumentScanner'>
      <implements>
       <reference idref='configurable'/>
      </implements>
      <implements>
  -    <reference idref='dtd-source'/>
  +    <reference idref='document-source'/>
      </implements>
      <implements>
  -    <reference idref='dtd-content-model-source'/>
  +    <reference idref='entity-handler'/>
      </implements>
      <field name='fSymbolTable'>
       <note>This field is initialized on reset.</note>
  @@ -915,18 +1103,19 @@
       <note>This field is initialized on reset.</note>
       <reference idref='entity-manager'/>
      </field>
  -   <field name='fGrammarPool'>
  +   <field name='fDTDScanner'>
       <note>This field is initialized on reset.</note>
  -    <reference idref='grammar-pool'/>
  +    <reference idref='dtd-scanner'/>
      </field>
  -   <field name='fDTDHandler'>
  -    <reference idref='dtd-handler'/>
  +   <field name='fNamespaces'>
  +    <note>This field is initialized on reset.</note>
  +    <primitive type='boolean'/>
      </field>
  -   <field name='fDTDContentModelHandler'>
  -    <reference idref='dtd-content-model-handler'/>
  +   <field name='fDocumentHandler'>
  +    <reference idref='document-handler'/>
      </field>
      <constructor/>
  -   <method name='scanDTD'>
  +   <method name='scanDocument'>
       <param name='complete'>
        <primitive type='boolean'/>
       </param>
  @@ -940,7 +1129,8 @@
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='scanDTDFragment'>
  +   <!-- REVISIT: Document fragment scanning.
  +   <method name='scanDocumentFragment'>
       <param name='complete'>
        <primitive type='boolean'/>
       </param>
  @@ -954,323 +1144,88 @@
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='scanDTDInternalSubset'>
  -    <param name='complete'>
  -     <primitive type='boolean'/>
  -    </param>
  -    <returns>
  -     <primitive type='boolean'/>
  -    </returns>
  -    <throws>
  -     <reference idref='java-io-exception'/>
  -    </throws>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  +   -->
     </class>
  -
  -  <interface id='dtd-source' name='XMLDTDSource'>
  -   <method name='setDTDHandler'>
  -    <param name='dtdHandler'>
  -     <reference idref='dtd-handler'/>
  -    </param>
  -   </method>
  -  </interface>
   
  -  <interface id='dtd-handler' name='XMLDTDHandler'>
  -   <extends>
  +  <class id='dtd-scanner' name='XMLDTDScanner'>
  +   <implements>
  +    <reference idref='configurable'/>
  +   </implements>
  +   <implements>
  +    <reference idref='dtd-source'/>
  +   </implements>
  +   <implements>
  +    <reference idref='dtd-content-model-source'/>
  +   </implements>
  +   <implements>
       <reference idref='entity-handler'/>
  -   </extends>
  -   <constant name='CONDITIONAL_INCLUDE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='CONDITIONAL_IGNORE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <method name='startDTD'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='comment'>
  -    <param name='text'>
  -     <reference idref='string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='processingInstruction'>
  -    <param name='target'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='data'>
  -     <reference idref='string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='startExternalSubset'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endExternalSubset'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='elementDecl'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='contentModel'>
  -     <reference idref='string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='startAttlist'>
  -    <param name='elementName'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='attributeDecl'>
  -    <param name='elementName'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='attributeName'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='type'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='enumeration'>
  -     <array>
  -      <reference idref='java-string'/>
  -     </array>
  -    </param>
  -    <param name='defaultType'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='defaultValue'>
  -     <reference idref='string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endAttlist'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='internalEntityDecl'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='text'>
  -     <reference idref='string'/>
  -    </param>
  -    <param name='isPE'>
  -     <primitive type='boolean'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='externalEntityDecl'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='publicId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='systemId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='isPE'>
  -     <primitive type='boolean'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='unparsedEntityDecl'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='publicId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='systemId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='notation'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='notationDecl'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='publicId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='systemId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <!-- REVISIT: How do we handle these?
  -   <method name='startParameterEntity'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endParameterEntity'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   -->
  -   <method name='startConditional'>
  -    <param name='type'>
  -     <primitive type='short'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endConditional'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endDTD'>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -  </interface>
  -
  -  <interface id='dtd-content-model-source' name='XMLDTDContentModelSource'>
  -   <method name='setDTDContentModelHandler'>
  -    <param name='dtdContentModelHandler'>
  -     <reference idref='dtd-content-model-handler'/>
  -    </param>
  -   </method>
  -  </interface>
  -
  -  <interface id='dtd-content-model-handler' name='XMLDTDContentModelHandler'>
  -   <constant name='TYPE_EMPTY'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='TYPE_ANY'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='TYPE_MIXED'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='TYPE_CHILDREN'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='SEPARATOR_CHOICE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='SEPARATOR_SEQUENCE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='OCCURS_ZERO_OR_ONE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='OCCURS_ZERO_OR_MORE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <constant name='OCCURS_ONE_OR_MORE'>
  -    <primitive type='short'/>
  -   </constant>
  -   <method name='startContentModel'>
  -    <param name='elementName'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='type'>
  -     <primitive type='short'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='mixedElement'>
  -    <param name='elementName'>
  -     <reference idref='java-string'/>
  +   </implements>
  +   <field name='fSymbolTable'>
  +    <note>This field is initialized on reset.</note>
  +    <reference idref='symbol-table'/>
  +   </field>
  +   <field name='fErrorReporter'>
  +    <note>This field is initialized on reset.</note>
  +    <reference idref='error-reporter'/>
  +   </field>
  +   <field name='fEntityManager'>
  +    <note>This field is initialized on reset.</note>
  +    <reference idref='entity-manager'/>
  +   </field>
  +   <field name='fGrammarPool'>
  +    <note>This field is initialized on reset.</note>
  +    <reference idref='grammar-pool'/>
  +   </field>
  +   <field name='fDTDHandler'>
  +    <reference idref='dtd-handler'/>
  +   </field>
  +   <field name='fDTDContentModelHandler'>
  +    <reference idref='dtd-content-model-handler'/>
  +   </field>
  +   <constructor/>
  +   <method name='scanDTD'>
  +    <param name='complete'>
  +     <primitive type='boolean'/>
       </param>
  +    <returns>
  +     <primitive type='boolean'/>
  +    </returns>
       <throws>
  -     <reference idref='sax-exception'/>
  +     <reference idref='java-io-exception'/>
       </throws>
  -   </method>
  -   <method name='childrenStartGroup'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='childrenElement'>
  -    <param name='elementName'>
  -     <reference idref='java-string'/>
  +   <method name='scanDTDFragment'>
  +    <param name='complete'>
  +     <primitive type='boolean'/>
       </param>
  +    <returns>
  +     <primitive type='boolean'/>
  +    </returns>
       <throws>
  -     <reference idref='sax-exception'/>
  +     <reference idref='java-io-exception'/>
       </throws>
  -   </method>
  -   <method name='childrenSeparator'>
  -    <param name='separator'>
  -     <primitive type='short'/>
  -    </param>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -   <method name='childrenOccurrence'>
  -    <param name='occurrence'>
  -     <primitive type='short'/>
  +   <method name='scanDTDInternalSubset'>
  +    <param name='complete'>
  +     <primitive type='boolean'/>
       </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='childrenEndGroup'>
  +    <returns>
  +     <primitive type='boolean'/>
  +    </returns>
       <throws>
  -     <reference idref='sax-exception'/>
  +     <reference idref='java-io-exception'/>
       </throws>
  -   </method>
  -   <method name='endContentModel'>
       <throws>
        <reference idref='sax-exception'/>
       </throws>
      </method>
  -  </interface>
  -
  - </category>
  -
  - <!-- Category: READING -->
  - <category name='Reading' package='&package;.readers'>
  +  </class>
   
     <class id='entity-manager' name='XMLEntityManager'>
      <implements>
  @@ -1282,7 +1237,15 @@
      <field name='fEntityReader'>
       <reference idref='entity-reader'/>
      </field>
  +   <field name='fEntityHandler'>
  +    <reference idref='entity-handler'/>
  +   </field>
      <constructor/>
  +   <method name='setEntityHandler'>
  +    <param name='entityHandler'>
  +     <reference idref='entity-handler'/>
  +    </param>
  +   </method>
      <method name='addGeneralEntity'>
       <param name='name'>
        <reference idref='java-string'/>
  @@ -1357,7 +1320,12 @@
        <reference idref='java-string'/>
       </param>
      </method>
  -   <method name='startEntity'>
  +   <method name='startDocumentEntity'>
  +    <param name='inputSource'>
  +     <reference idref='sax-input-source'/>
  +    </param>
  +   </method>
  +   <method name='startDTDEntity'>
       <param name='inputSource'>
        <reference idref='sax-input-source'/>
       </param>
  @@ -1373,9 +1341,7 @@
      <implements>
       <reference idref='sax-locator'/>
      </implements>
  -   <field name='fEntityHandler'>
  -    <reference idref='entity-handler'/>
  -   </field>
  +   <!--
      <field name='fSymbolTable'>
       <reference idref='symbol-table'/>
      </field>
  @@ -1395,11 +1361,6 @@
       <primitive type='long'/>
      </field>
      <constructor/>
  -   <method name='setEntityHandler'>
  -    <param name='entityHandler'>
  -     <reference idref='entity-handler'/>
  -    </param>
  -   </method>
      <method name='getBytePosition'>
       <returns>
        <primitive type='long'/>
  @@ -1410,6 +1371,7 @@
        <primitive type='long'/>
       </returns>
      </method>
  +   -->
      <method name='peekChar'>
       <returns>
        <primitive type='int'/>
  @@ -1491,8 +1453,8 @@
        <reference idref='string'/>
       </param>
       <returns>
  -     <note>The next character on the stream.</note>
  -     <primitive type='int'/>
  +     <note>True if there is more data to scan.</note>
  +     <primitive type='boolean'/>
       </returns>
       <throws>
        <reference idref='java-io-exception'/>
  @@ -1503,7 +1465,7 @@
        <primitive type='int'/>
       </param>
       <returns>
  -     <note>True if spaces were skipped.</note>
  +     <note>True if the char was skipped.</note>
        <primitive type='boolean'/>
       </returns>
       <throws>
  @@ -1534,45 +1496,12 @@
      </method>
     </class>
   
  -  <interface id='entity-handler' name='XMLEntityHandler'>
  -   <method name='startEntity'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='publicId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <param name='systemId'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -   <method name='endEntity'>
  -    <param name='name'>
  -     <reference idref='java-string'/>
  -    </param>
  -    <throws>
  -     <reference idref='sax-exception'/>
  -    </throws>
  -   </method>
  -  </interface>
  -
  - </category>
  -
  - <!-- Category: VALIDATING -->
  - <category name='Validating' package='&package;.validators'>
  -
     <class id='validator' name='XMLValidator'>
      <implements>
       <reference idref='configurable'/>
      </implements>
  -   <implements>
  -    <reference idref='document-source'/>
  -   </implements>
      <implements>
  -    <reference idref='document-handler'/>
  +    <reference idref='document-filter'/>
      </implements>
      <field name='fSymbolTable'>
       <note>This field is initialized on reset.</note>
  @@ -1604,6 +1533,11 @@
      <constructor/>
     </class>
   
  + </category>
  +
  + <!-- Category: VALIDATING -->
  + <category name='Implementation: Validation' package='&package;.impl.validation'>
  +
     <class id='grammar-pool' name='GrammarPool'>
      <field name='fGrammars'>
       <collection>
  @@ -2242,7 +2176,7 @@
    </category>
   
    <!-- Category: VALIDATING: Content Models -->
  - <category name='Validating: Content Models' package='&package;.validators.models'>
  + <category name='Implementation: Validation Content Models' package='&package;.impl.validation.models'>
     
     <class id='simple-content-model' name='SimpleContentModel'>
      <implements>
  @@ -2325,7 +2259,7 @@
    </category>
    
    <!-- Category: VALIDATING: Datatypes -->
  - <category name='Validating: Datatypes' package='&package;.validators.datatypes'>
  + <category name='Implementation: Validation Datatypes' package='&package;.impl.validation.datatypes'>
   
     <class id='datatype-validator-factory-impl' name='DatatypeValidatorFactoryImpl'>
      <implements>
  @@ -2410,7 +2344,7 @@
    </category>
   
    <!-- Category: VALIDATING: Grammars -->
  - <category name='Validating: Grammars' package='&package;.validators.grammars'>
  + <category name='Implementation: Validation Grammars' package='&package;.impl.validation.grammars'>
   
     <class id='dtd-grammar' name='DTDGrammar'>
      <extends>
  @@ -2793,7 +2727,7 @@
    </category>
   
    <!-- Category: UTILS -->
  - <category name='Utils' package='&package;.utils'>
  + <category name='Utility Interfaces and Classes' package='&package;.util'>
   
     <class id='char' name='XMLChar'>
      <constant name='CHARS'>
  @@ -2832,7 +2766,7 @@
      </constant>
      <method name='isValid'>
       <param name='c'>
  -     <primitive type='char'/>
  +     <primitive type='int'/>
       </param>
       <returns>
        <primitive type='boolean'/>
  @@ -2847,7 +2781,7 @@
        <primitive type='boolean'/>
       </returns>
      </method>
  -   <method name='isCombining'>
  +   <method name='isCombiningChar'>
       <param name='c'>
        <primitive type='char'/>
       </param>
  @@ -3030,34 +2964,88 @@
      </method>
     </class>
   
  -  <class id='qname' name='QName'>
  -   <field name='prefix' visibility='public'>
  -    <reference idref='java-string'/>
  +  <class id='error-reporter' name='XMLErrorReporter'>
  +   <implements>
  +    <reference idref='configurable'/>
  +   </implements>
  +   <constant name='SEVERITY_WARNING'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='SEVERITY_ERROR'>
  +    <primitive type='short'/>
  +   </constant>
  +   <constant name='SEVERITY_FATAL_ERROR'>
  +    <primitive type='short'/>
  +   </constant>
  +   <field name='fLocale'>
  +    <reference idref='java-locale'/>
      </field>
  -   <field name='localpart' visibility='public'>
  -    <reference idref='java-string'/>
  +   <field name='fMessageFormatters'>
  +    <collection>
  +     <collector>
  +      <reference idref='java-hashtable'/>
  +     </collector>
  +     <items>
  +      <reference idref='message-formatter'/>
  +     </items>
  +    </collection>
      </field>
  -   <field name='rawname' visibility='public'>
  -    <reference idref='java-string'/>
  +   <field name='fErrorHandler'>
  +    <reference idref='sax-error-handler'/>
      </field>
  -   <field name='uri' visibility='public'>
  -    <reference idref='java-string'/>
  +   <field name='fContinueAfterFatalError'>
  +    <note>This field is initialized on reset.</note>
  +    <primitive type='boolean'/>
      </field>
  -   <method name='setValues'>
  -    <param name='prefix'>
  +   <constructor/>
  +   <method name='setLocale'>
  +    <param name='locale'>
  +     <reference idref='java-locale'/>
  +    </param>
  +   </method>
  +   <method name='putMessageFormatter'>
  +    <param name='domain'>
        <reference idref='java-string'/>
       </param>
  -    <param name='localpart'>
  +    <param name='messageFormatter'>
  +     <reference idref='message-formatter'/>
  +    </param>
  +   </method>
  +   <method name='getMessageFormatter'>
  +    <param name='domain'>
        <reference idref='java-string'/>
       </param>
  -    <param name='rawname'>
  +    <returns>
  +     <reference idref='message-formatter'/>
  +    </returns>
  +   </method>
  +   <method name='removeMessageFormatter'>
  +    <param name='domain'>
        <reference idref='java-string'/>
       </param>
  -    <param name='uri'>
  +    <returns>
  +     <reference idref='message-formatter'/>
  +    </returns>
  +   </method>
  +   <method name='reportError'>
  +    <param name='domain'>
  +     <reference idref='java-string'/>
  +    </param>
  +    <param name='key'>
        <reference idref='java-string'/>
       </param>
  +    <param name='arguments'>
  +     <array>
  +      <reference idref='java-object'/>
  +     </array>
  +    </param>
  +    <param name='severity'>
  +     <primitive type='short'/>
  +    </param>
  +    <throws>
  +     <reference idref='sax-exception'/>
  +    </throws>
      </method>
  -   <method name='clear'/>
     </class>
   
     <interface id='message-formatter' name='MessageFormatter'>
  @@ -3081,6 +3069,50 @@
       </throws>
      </method>
     </interface>
  +
  +  <class id='string-buffer' name='XMLStringBuffer'>
  +   <extends>
  +    <reference idref='string'/>
  +   </extends>
  +   <constant name='DEFAULT_SIZE'>
  +    <primitive type='int'/>
  +   </constant>
  +   <constructor/>
  +   <constructor>
  +    <param name='size'>
  +     <primitive type='int'/>
  +    </param>
  +   </constructor>
  +   <method name='clear'/>
  +   <method name='append'>
  +    <param name='c'>
  +     <primitive type='char'/>
  +    </param>
  +   </method>
  +   <method name='append'>
  +    <param name='s'>
  +     <reference idref='java-string'/>
  +    </param>
  +   </method>
  +   <method name='append'>
  +    <param name='ch'>
  +     <array>
  +      <primitive type='char'/>
  +     </array>
  +    </param>
  +    <param name='offset'>
  +     <primitive type='int'/>
  +    </param>
  +    <param name='length'>
  +     <primitive type='int'/>
  +    </param>
  +   </method>
  +   <method name='append'>
  +    <param name='s'>
  +     <reference idref='string'/>
  +    </param>
  +   </method>
  +  </class>
   
    </category>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-xerces/java/design/xsl/Attic/design.xsl
  
  Index: design.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/design/xsl/Attic/design.xsl,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- design.xsl	2000/09/15 21:57:23	1.1.2.1
  +++ design.xsl	2000/10/02 00:16:22	1.1.2.2
  @@ -1,5 +1,5 @@
   <?xml version='1.0' encoding='US-ASCII'?>
  -<!-- $Id: design.xsl,v 1.1.2.1 2000/09/15 21:57:23 andyc Exp $ -->
  +<!-- $Id: design.xsl,v 1.1.2.2 2000/10/02 00:16:22 andyc Exp $ -->
   <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
   
    <xsl:template match='design'>
  @@ -19,7 +19,7 @@
       <xsl:for-each select='category'>
        <xsl:apply-templates select='.'/>
       </xsl:for-each>
  -    Last modified: <xsl:value-of select='date'/>
  +    Last modified: <xsl:value-of select='@date'/>
      </BODY>
     </HTML>
    </xsl:template>