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

cvs commit: xml-xerces/java/src/org/apache/xerces/validators/dtd DTDGrammar.java

ericye      00/07/07 14:22:01

  Modified:    java/src/org/apache/xerces/validators/schema
                        TraverseSchema.java SchemaGrammar.java
               java/src/org/apache/xerces/validators/dtd DTDGrammar.java
  Log:
  Change element form attribute behavior to be 100% consistent with Schema spec
  
  Revision  Changes    Path
  1.35      +11 -9     xml-xerces/java/src/org/apache/xerces/validators/schema/TraverseSchema.java
  
  Index: TraverseSchema.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/TraverseSchema.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- TraverseSchema.java	2000/07/06 19:19:37	1.34
  +++ TraverseSchema.java	2000/07/07 21:21:59	1.35
  @@ -374,7 +374,7 @@
    *         Eric Ye
    * @see                  org.apache.xerces.validators.common.Grammar
    *
  - * @version $Id: TraverseSchema.java,v 1.34 2000/07/06 19:19:37 ericye Exp $
  + * @version $Id: TraverseSchema.java,v 1.35 2000/07/07 21:21:59 ericye Exp $
    */
   
   public class TraverseSchema implements 
  @@ -2420,7 +2420,7 @@
           if (isTopLevel(elementDecl)) {
           
               int nameIndex = fStringPool.addSymbol(name);
  -            int eltKey = fSchemaGrammar.getElementDeclIndex(nameIndex,TOP_LEVEL_SCOPE);
  +            int eltKey = fSchemaGrammar.getElementDeclIndex(fTargetNSURI, nameIndex,TOP_LEVEL_SCOPE);
               if (eltKey > -1 ) {
                   return new QName(-1,nameIndex,nameIndex,fTargetNSURI);
               }
  @@ -2471,7 +2471,7 @@
                   return eltName;
               }
   
  -            int elementIndex = fSchemaGrammar.getElementDeclIndex(localpartIndex, TOP_LEVEL_SCOPE);
  +            int elementIndex = fSchemaGrammar.getElementDeclIndex(eltName, TOP_LEVEL_SCOPE);
               //if not found, traverse the top level element that if referenced
   
               if (elementIndex == -1 ) {
  @@ -2508,12 +2508,12 @@
               }
               else {
                   equivClassElementDeclIndex = 
  -                    fSchemaGrammar.getElementDeclIndex(getLocalPartIndex(equivClass),TOP_LEVEL_SCOPE);
  +                    fSchemaGrammar.getElementDeclIndex(fTargetNSURI, getLocalPartIndex(equivClass),TOP_LEVEL_SCOPE);
   
                   if ( equivClassElementDeclIndex == -1) {
                       traverseElementDecl(equivClassElementDecl);
                       equivClassElementDeclIndex = 
  -                        fSchemaGrammar.getElementDeclIndex(getLocalPartIndex(equivClass),TOP_LEVEL_SCOPE);
  +                        fSchemaGrammar.getElementDeclIndex(fTargetNSURI, getLocalPartIndex(equivClass),TOP_LEVEL_SCOPE);
                   }
               }
           }
  @@ -2550,8 +2550,6 @@
                       // REVISIT: Localize
                       reportGenericSchemaError("traverse complexType error in element '" + name +"'"); 
                   }
  -                //System.out.println("typeInfo.scopeDefined : " + typeInfo.typeName+","+"["+typeInfo.scopeDefined+"]"
  -                  //                 +", base is " + fSchemaGrammar.getElementDeclIndex(fStringPool.addSymbol("heater"), typeInfo.baseComplexTypeInfo.scopeDefined));
                   haveAnonType = true;
               } 
               else if (childName.equals(SchemaSymbols.ELT_SIMPLETYPE)) {
  @@ -2710,14 +2708,18 @@
           int enclosingScope = fCurrentScope;
   
           if ( isQName.equals(SchemaSymbols.ATTVAL_QUALIFIED)||
  -             fElementDefaultQualified || isTopLevel(elementDecl) ) {
  +             fElementDefaultQualified ) {
               uriIndex = fTargetNSURI;
  +        }
  +
  +        if ( isTopLevel(elementDecl)) {
  +            uriIndex = fTargetNSURI;
               enclosingScope = TOP_LEVEL_SCOPE;
           }
   
   
           //There can never be two elements with the same name and different type in the same scope.
  -        int existSuchElementIndex = fSchemaGrammar.getElementDeclIndex(localpartIndex, enclosingScope);
  +        int existSuchElementIndex = fSchemaGrammar.getElementDeclIndex(uriIndex, localpartIndex, enclosingScope);
           if ( existSuchElementIndex > -1) {
               fSchemaGrammar.getElementDecl(existSuchElementIndex, fTempElementDecl);
               DatatypeValidator edv = fTempElementDecl.datatypeValidator;
  
  
  
  1.10      +2 -2      xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java
  
  Index: SchemaGrammar.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaGrammar.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SchemaGrammar.java	2000/07/03 23:41:33	1.9
  +++ SchemaGrammar.java	2000/07/07 21:22:00	1.10
  @@ -56,7 +56,7 @@
    * <http://www.apache.org/>.
    */
    /*
  - * @version $Id: SchemaGrammar.java,v 1.9 2000/07/03 23:41:33 ericye Exp $
  + * @version $Id: SchemaGrammar.java,v 1.10 2000/07/07 21:22:00 ericye Exp $
    */
   package org.apache.xerces.validators.schema;
   
  @@ -359,7 +359,7 @@
       protected int addElementDecl(QName eltQName, int enclosingScope, int scopeDefined, 
                                    int contentSpecType, int contentSpecIndex, 
                                    int attrListHead, DatatypeValidator dv){
  -        int elementDeclIndex = getElementDeclIndex(eltQName.localpart, enclosingScope);
  +        int elementDeclIndex = getElementDeclIndex(eltQName, enclosingScope);
           if (elementDeclIndex == -1) {
               if (enclosingScope<-1 || scopeDefined < -1 ) {
                   //TO DO: report error here;
  
  
  
  1.5       +2 -2      xml-xerces/java/src/org/apache/xerces/validators/dtd/DTDGrammar.java
  
  Index: DTDGrammar.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/dtd/DTDGrammar.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DTDGrammar.java	2000/06/02 05:38:45	1.4
  +++ DTDGrammar.java	2000/07/07 21:22:00	1.5
  @@ -85,7 +85,7 @@
    * SAX2 DeclHandler callbacks.)
    *
    * @author Andy Clark
  - * @version $Id: DTDGrammar.java,v 1.4 2000/06/02 05:38:45 jeffreyr Exp $
  + * @version $Id: DTDGrammar.java,v 1.5 2000/07/07 21:22:00 ericye Exp $
    */
   public class DTDGrammar
       extends Grammar 
  @@ -464,7 +464,7 @@
           fAttributeDecl.defaultType = attDefaultType;
           fAttributeDecl.defaultValue = fStringPool.toString(attDefaultValue);
   
  -        int elementDeclIndex = getElementDeclIndex(elementDecl.localpart, -1);
  +        int elementDeclIndex = getElementDeclIndex(elementDecl, -1);
           setAttributeDecl(elementDeclIndex, attributeDeclIndex, fAttributeDecl);
   
           int chunk = attributeDeclIndex >> CHUNK_SHIFT;