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/04 03:29:16 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema SchemaSymbols.java TraverseSchema.java

ericye      00/07/03 18:29:16

  Modified:    java/src/org/apache/xerces/validators/schema
                        SchemaSymbols.java TraverseSchema.java
  Log:
  add xsi:type support in the valid cases.
  --ericye
  
  Revision  Changes    Path
  1.5       +1 -0      xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaSymbols.java
  
  Index: SchemaSymbols.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/schema/SchemaSymbols.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SchemaSymbols.java	2000/07/03 23:41:34	1.4
  +++ SchemaSymbols.java	2000/07/04 01:28:51	1.5
  @@ -71,6 +71,7 @@
       public static final String URI_SCHEMAFORSCHEMA =  "http://www.w3.org/1999/XMLSchema";
       public static final String XSI_SCHEMALOCACTION =  "schemaLocation";
       public static final String XSI_NONAMESPACESCHEMALOCACTION =  "noNamespaceSchemaLocation";
  +    public static final String XSI_TYPE =  "type";
   
       public static final String ELT_ALL =  "all";
       public static final String ELT_ANNOTATION =  "annotation";
  
  
  
  1.33      +4 -1      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- TraverseSchema.java	2000/07/03 23:41:34	1.32
  +++ TraverseSchema.java	2000/07/04 01:28:55	1.33
  @@ -374,7 +374,7 @@
    *         Eric Ye
    * @see                  org.apache.xerces.validators.common.Grammar
    *
  - * @version $Id: TraverseSchema.java,v 1.32 2000/07/03 23:41:34 ericye Exp $
  + * @version $Id: TraverseSchema.java,v 1.33 2000/07/04 01:28:55 ericye Exp $
    */
   
   public class TraverseSchema implements 
  @@ -1755,6 +1755,9 @@
               fCurrentTypeNameStack.pop();
               checkRecursingComplexType();
           }
  +
  +        //set template element's typeInfo
  +        fSchemaGrammar.setElementComplexTypeInfo(typeInfo.templateElementIndex, typeInfo);
   
           typeNameIndex = fStringPool.addSymbol(typeName);
           return typeNameIndex;