xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sandy...@apache.org
Subject cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/traversers XSDElementTraverser.java XSDHandler.java
Date Wed, 06 Apr 2005 18:50:08 GMT
sandygao    2005/04/06 11:50:08

  Modified:    java/src/org/apache/xerces/impl/xs/traversers
                        XSDElementTraverser.java XSDHandler.java
  Log:
  Fixing a bug. In schema documents, namespace declarations on local element
  declarations were not recognized when referred to.
  
  Revision  Changes    Path
  1.35      +6 -3      xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java
  
  Index: XSDElementTraverser.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDElementTraverser.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- XSDElementTraverser.java	20 Dec 2004 05:43:36 -0000	1.34
  +++ XSDElementTraverser.java	6 Apr 2005 18:50:08 -0000	1.35
  @@ -118,7 +118,7 @@
               }
               fSchemaHandler.fillInLocalElemInfo(elmDecl, schemaDoc, allContextFlags, parent,
particle);
           } else {
  -            traverseLocal(particle, elmDecl, schemaDoc, grammar, allContextFlags, parent);
  +            traverseLocal(particle, elmDecl, schemaDoc, grammar, allContextFlags, parent,
null);
               // If it's an empty particle, return null.
               if (particle.fType == XSParticleDecl.PARTICLE_EMPTY)
                   particle = null;
  @@ -140,8 +140,11 @@
               XSDocumentInfo schemaDoc,
               SchemaGrammar grammar,
               int allContextFlags,
  -            XSObject parent) {
  +            XSObject parent,
  +            String[] localNSDecls) {
           
  +        if (localNSDecls != null)
  +            schemaDoc.fNamespaceSupport.setEffectiveContext(localNSDecls);
           // General Attribute Checking
           Object[] attrValues = fAttrChecker.checkAttributes(elmDecl, false, schemaDoc);
           
  
  
  
  1.89      +2 -2      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.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- XSDHandler.java	1 Apr 2005 13:55:12 -0000	1.88
  +++ XSDHandler.java	6 Apr 2005 18:50:08 -0000	1.89
  @@ -1813,7 +1813,7 @@
               Element currElem = fLocalElementDecl[i];
               XSDocumentInfo currSchema = (XSDocumentInfo)fDoc2XSDocumentMap.get(DOMUtil.getDocument(currElem));
               SchemaGrammar currGrammar = fGrammarBucket.getGrammar(currSchema.fTargetNamespace);
  -            fElementTraverser.traverseLocal (fParticle[i], currElem, currSchema, currGrammar,
fAllContext[i], fParent[i]);
  +            fElementTraverser.traverseLocal (fParticle[i], currElem, currSchema, currGrammar,
fAllContext[i], fParent[i], fLocalElemNamespaceContext[i]);
               // If it's an empty particle, remove it from the containing component.
               if (fParticle[i].fType == XSParticleDecl.PARTICLE_EMPTY) {
                   XSModelGroupImpl group = null;
  
  
  

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


Mime
View raw message