You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2001/03/06 21:25:59 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/schema TraverseSchema.java
elena 01/03/06 12:25:59
Modified: java/src/org/apache/xerces/validators/schema
TraverseSchema.java
Log:
Allowing <annotation> as a first kid of <union>
Revision Changes Path
1.113 +8 -5 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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- TraverseSchema.java 2001/03/05 22:21:51 1.112
+++ TraverseSchema.java 2001/03/06 20:25:57 1.113
@@ -125,7 +125,7 @@
*
* @see org.apache.xerces.validators.common.Grammar
*
- * @version $Id: TraverseSchema.java,v 1.112 2001/03/05 22:21:51 elena Exp $
+ * @version $Id: TraverseSchema.java,v 1.113 2001/03/06 20:25:57 elena Exp $
*/
public class TraverseSchema implements
NamespacesScope.NamespacesHandler{
@@ -1434,9 +1434,9 @@
if (content.getLocalName().equals( SchemaSymbols.ELT_SIMPLETYPE )) { //Test...
typeNameIndex = traverseSimpleTypeDecl(content);
if (DEBUG_UNION) {
- System.out.println("[After traverseSimpleTypeDecl]: " +fStringPool.toString(typeNameIndex));
- System.out.println("[traverseSimpleTypeDecl]: " + nameProperty);
- }
+ System.out.println("[After traverseSimpleTypeDecl]: " +fStringPool.toString(typeNameIndex));
+ System.out.println("[traverseSimpleTypeDecl]: " + nameProperty);
+ }
if (typeNameIndex!=-1) {
baseValidator=fDatatypeRegistry.getDatatypeValidator(fStringPool.toString(typeNameIndex));
if (baseValidator !=null && union) {
@@ -1495,7 +1495,10 @@
//get more types for union if any
if (union) {
- int index=size;
+ int index=size;
+ if (!baseTypeQNameProperty.equals ("")) {
+ content = checkContent(simpleTypeDecl, content, true);
+ }
while (content!=null) {
if (DEBUG_UNION) {
System.out.println("[start Union types traversal] + " + content.getNodeName());