cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/traversers XSDHandler.java

[sandygao]

sandygao    2002/12/11 08:01:19

  Modified:    java/src/org/apache/xerces/impl/xs/dom DOMParser.java
               java/src/org/apache/xerces/impl/xs/traversers
                        XSDHandler.java
  Log:
  Modifying XSDHandler so that it doesn't rely on DOMNodePool directly.
  This made it easier to switch to another DOM implementation
  (DTM for example).
  
  Revision  Changes    Path
  1.9       +7 -6      xml-xerces/java/src/org/apache/xerces/impl/xs/dom/DOMParser.java
  
  Index: DOMParser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/dom/DOMParser.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DOMParser.java    24 Sep 2002 23:05:18 -0000      1.8
  +++ DOMParser.java    11 Dec 2002 16:01:18 -0000      1.9
  @@ -128,10 +128,14 @@
           }
           catch (Exception e) {
           }
  +        fNodePool = new DOMNodePool();
       } // <init>()
   
  -    public void setPool(DOMNodePool nodePool){
  -        fNodePool = nodePool;
  +    /**
  +     * Resets the node pool.
  +     */
  +    public void resetNodePool() {
  +        fNodePool.reset();
       }
   
       /**
  @@ -252,8 +256,5 @@
                                                fLocator.getLineNumber(),
                                                fLocator.getColumnNumber());
       }
  -
  -
  -
   
   } // class DOMParser
  
  
  
  1.58      +2 -7      
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
  
  Index: XSDHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- XSDHandler.java   11 Nov 2002 15:24:43 -0000      1.57
  +++ XSDHandler.java   11 Dec 2002 16:01:18 -0000      1.58
  @@ -284,7 +284,6 @@
       XSDWildcardTraverser fWildCardTraverser;
   
       DOMParser fSchemaParser;
  -    final DOMNodePool fDOMPool = new DOMNodePool();
   
       // these data members are needed for the deferred traversal
       // of local elements.
  @@ -347,10 +346,8 @@
           if (grammar != null)
               return grammar;
           
  -        // reset pools
  -        fDOMPool.reset();
           if (fSchemaParser != null) {
  -            fSchemaParser.setPool(fDOMPool);
  +            fSchemaParser.resetNodePool();
           }
   
           short referType = desc.getContextType();
  @@ -1355,9 +1352,7 @@
                   if (fSchemaParser == null) {
                       fSchemaParser = new DOMParser();
                       resetSchemaParserErrorHandler();
  -                    fSchemaParser.setPool(fDOMPool);
                   }
  -                fSchemaParser.reset();
                   fSchemaParser.parse(schemaSource);
                   schemaDoc = fSchemaParser.getDocument();
                   // now we need to store the mapping information from system id
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]