[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xerces-cvs
Subject:    cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/traversers XSDHandler.java XSDElementTrave
From:       sandygao () apache ! org
Date:       2001-12-20 16:45:51
[Download RAW message or body]

sandygao    01/12/20 08:45:51

  Modified:    java/src/org/apache/xerces/impl/xs/traversers
                        XSDHandler.java XSDElementTraverser.java
  Log:
  To be consistent with other global-scoped components, we need to set
  <key>/<unique>/<keyref> elements to hidden before traversing them.
  
  Revision  Changes    Path
  1.8       +4 -1      \
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XSDHandler.java	2001/12/10 23:30:16	1.7
  +++ XSDHandler.java	2001/12/20 16:45:51	1.8
  @@ -97,7 +97,7 @@
    * schema, other grammars may be constructed as a side-effect.
    *
    * @author Neil Graham, IBM
  - * @version $Id: XSDHandler.java,v 1.7 2001/12/10 23:30:16 sandygao Exp $
  + * @version $Id: XSDHandler.java,v 1.8 2001/12/20 16:45:51 sandygao Exp $
    */
   
   public class XSDHandler {
  @@ -966,6 +966,9 @@
               keyrefSchemaDoc.fNamespaceSupport.makeGlobal();
               keyrefSchemaDoc.fNamespaceSupport.setEffectiveContext( \
                fKeyrefNamespaceContext[i] );
               SchemaGrammar keyrefGrammar = \
fGrammarResolver.getGrammar(keyrefSchemaDoc.fTargetNamespace);  +            // need \
to set <keyref> to hidden before traversing it,  +            // because it has \
global scope  +            DOMUtil.setHidden(fKeyrefs[i]);
               fKeyrefTraverser.traverse(fKeyrefs[i], fKeyrefElems[i], \
keyrefSchemaDoc, keyrefGrammar);  }
       } // end resolveKeyRefs
  
  
  
  1.10      +4 -1      \
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XSDElementTraverser.java	2001/12/14 20:04:16	1.9
  +++ XSDElementTraverser.java	2001/12/20 16:45:51	1.10
  @@ -98,7 +98,7 @@
    *
    * @author Sandy Gao, IBM
    *
  - * @version $Id: XSDElementTraverser.java,v 1.9 2001/12/14 20:04:16 sandygao Exp $
  + * @version $Id: XSDElementTraverser.java,v 1.10 2001/12/20 16:45:51 sandygao Exp \
                $
    */
   class XSDElementTraverser extends XSDAbstractTraverser {
   
  @@ -359,6 +359,9 @@
   
                   if (childName.equals(SchemaSymbols.ELT_KEY) ||
                           childName.equals(SchemaSymbols.ELT_UNIQUE)) {
  +                    // need to set <key>/<unique> to hidden before traversing it,
  +                    // because it has global scope
  +                    DOMUtil.setHidden(child);
                       fSchemaHandler.fUniqueOrKeyTraverser.traverse(child, element, \
                schemaDoc, grammar);
                       if(DOMUtil.getAttrValue(child, \
SchemaSymbols.ATT_NAME).length() != 0 ) {  fSchemaHandler.checkForDuplicateNames(
  
  
  

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


[prev in list] [next in list] [prev in thread] [next in thread]