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

[sandygao]

sandygao    2005/02/02 08:44:23

  Modified:    java/src/org/apache/xerces/impl/xs
                        SubstitutionGroupHandler.java
  Log:
  Should take "block=substitution" into account when computing
  the substitution group for an element.
  
  Revision  Changes    Path
  1.17      +8 -1      
xml-xerces/java/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java
  
  Index: SubstitutionGroupHandler.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/SubstitutionGroupHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SubstitutionGroupHandler.java     6 Oct 2004 15:14:55 -0000       1.16
  +++ SubstitutionGroupHandler.java     2 Feb 2005 16:44:22 -0000       1.17
  @@ -33,6 +33,8 @@
    */
   public class SubstitutionGroupHandler {
   
  +    private static final XSElementDecl[] EMPTY_GROUP = new XSElementDecl[0];
  +
       // grammar resolver
       XSGrammarBucket fGrammarBucket;
   
  @@ -196,6 +198,11 @@
           if (subGroup != null)
               return (XSElementDecl[])subGroup;
           
  +        if ((element.fBlock & XSConstants.DERIVATION_SUBSTITUTION) != 0) {
  +            fSubGroups.put(element, EMPTY_GROUP);
  +            return EMPTY_GROUP;
  +        }
  +        
           // Otherwise, get all potential sub group elements
           // (without considering "block" on this element
           OneSubGroup[] groupB = getSubGroupB(element, new OneSubGroup());
  
  
  

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