cvs commit: xml-xerces/java/src/org/apache/xerces/parsers XMLDocumentParser.java

[an...@locus.apache.org]

andyc       00/09/26 11:41:43

  Modified:    java/src/org/apache/xerces/parsers Tag: xerces_j_2
                        XMLDocumentParser.java
  Log:
  Added entity manager to document parser so that there is a
  non-null manager for components that query and use it. This
  was specifically needed once I started working on the
  document scanner which needs to scan XML content from
  entities.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +9 -1      xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java
  
  Index: XMLDocumentParser.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- XMLDocumentParser.java	2000/09/26 03:15:36	1.1.2.6
  +++ XMLDocumentParser.java	2000/09/26 18:41:42	1.1.2.7
  @@ -59,6 +59,7 @@
   
   import java.io.IOException;
   import org.apache.xerces.framework.XMLString;
  +import org.apache.xerces.readers.XMLEntityManager;
   import org.apache.xerces.scanners.XMLAttributes;
   import org.apache.xerces.scanners.XMLDTDScanner;
   import org.apache.xerces.scanners.XMLDocumentHandler;
  @@ -76,7 +77,7 @@
   /**
    * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
    * @author Arnaud  Le Hors, IBM
  - * @version $Id: XMLDocumentParser.java,v 1.1.2.6 2000/09/26 03:15:36 andyc Exp $
  + * @version $Id: XMLDocumentParser.java,v 1.1.2.7 2000/09/26 18:41:42 andyc Exp $
    */
   public abstract class XMLDocumentParser
       extends XMLParser
  @@ -86,6 +87,9 @@
       // Data
       //
   
  +    /** Entity manager. */
  +    protected XMLEntityManager fEntityManager;
  +
       /** fScanner */
       protected XMLDocumentScanner fScanner;
   
  @@ -140,6 +144,9 @@
           fGrammarPool = grammarPool;
           fProperties.put(XERCES_PROPERTIES_PREFIX + "internal/grammar-pool",
                           fGrammarPool);
  +        fEntityManager = new XMLEntityManager();
  +        fProperties.put(XERCES_PROPERTIES_PREFIX+"internal/entity-manager",
  +                        fEntityManager);
           fScanner = new XMLDocumentScanner();
           fProperties.put(XERCES_PROPERTIES_PREFIX+"internal/document-scanner",
                           fScanner);
  @@ -410,6 +417,7 @@
   
           super.reset();
           // reset every component
  +        fEntityManager.reset(this);
           fScanner.reset(this);
           // fDTDScanner.reset(this);
           // fValidator.reset(this);