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

cvs commit: xml-xerces/java/src/org/apache/xerces/readers XMLEntityManager.java XMLEntityScanner.java

jeffreyr    00/09/22 17:25:01

  Modified:    java/src/org/apache/xerces/readers Tag: xerces_j_2
                        XMLEntityManager.java XMLEntityScanner.java
  Log:
  More Singleton for entity manager and entity scanner setup
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +2 -2      xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityManager.java
  
  Index: XMLEntityManager.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityManager.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- XMLEntityManager.java	2000/09/23 00:15:46	1.1.2.6
  +++ XMLEntityManager.java	2000/09/23 00:24:59	1.1.2.7
  @@ -68,7 +68,7 @@
   
   /**
    * @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
  - * @version $Id: XMLEntityManager.java,v 1.1.2.6 2000/09/23 00:15:46 jeffreyr Exp $
  + * @version $Id: XMLEntityManager.java,v 1.1.2.7 2000/09/23 00:24:59 jeffreyr Exp $
    */
   public class XMLEntityManager
       implements XMLComponent {
  @@ -178,7 +178,7 @@
        * @return 
        */
       public XMLEntityScanner getEntityScanner() {
  -        return null;
  +        return XMLEntityScanner.getEntityScanner();
       } // getEntityScanner
   
   
  
  
  
  1.1.2.3   +11 -2     xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityScanner.java
  
  Index: XMLEntityScanner.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/readers/Attic/XMLEntityScanner.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- XMLEntityScanner.java	2000/09/21 20:28:15	1.1.2.2
  +++ XMLEntityScanner.java	2000/09/23 00:25:00	1.1.2.3
  @@ -65,7 +65,7 @@
   
   /**
    * @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
  - * @version $Id: XMLEntityScanner.java,v 1.1.2.2 2000/09/21 20:28:15 jeffreyr Exp $
  + * @version $Id: XMLEntityScanner.java,v 1.1.2.3 2000/09/23 00:25:00 jeffreyr Exp $
    */
   public class XMLEntityScanner
       implements Locator {
  @@ -74,6 +74,8 @@
       // Data
       //
   
  +    private static XMLEntityScanner fEntityScannerInstance = new XMLEntityScanner();
  +
       /** fEntityHandler */
       protected XMLEntityHandler fEntityHandler;
   
  @@ -99,7 +101,8 @@
       /**
        * 
        */
  -    public XMLEntityScanner() {
  +    private XMLEntityScanner() {
  +
       }
   
       //
  @@ -132,6 +135,12 @@
       public long getCharPosition() {
           return -1;
       } // getCharPosition
  +
  +
  +   static public XMLEntityScanner getEntityScanner() {
  +       return fEntityScannerInstance;//return the only instance of it
  +   }
  +
   
       /**
        * peekChar