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

List:       xerces-cvs
Subject:    svn commit: r1171226 -
From:       knoaman () apache ! org
Date:       2011-09-15 19:06:33
Message-ID: 20110915190633.A7E4B238889B () eris ! apache ! org
[Download RAW message or body]

Author: knoaman
Date: Thu Sep 15 19:06:33 2011
New Revision: 1171226

URL: http://svn.apache.org/viewvc?rev=1171226&view=rev
Log:
Fix for Jira bug 1531 - https://issues.apache.org/jira/browse/XERCESJ-1531

Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java


Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
                
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apac \
he/xerces/impl/xs/traversers/XSDHandler.java?rev=1171226&r1=1171225&r2=1171226&view=diff
 ==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java \
                (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java \
Thu Sep 15 19:06:33 2011 @@ -1451,7 +1451,9 @@ public class XSDHandler {
                         if (fSchemaVersion < Constants.SCHEMA_VERSION_1_1 || \
                !dependenciesCanOccur) {
                             reportSchemaError("s4s-elt-invalid-content.3", new \
Object [] {componentType}, globalComp);  }
-                        // skip it; traverse it later
+                        final SchemaGrammar currSG = \
fGrammarBucket.getGrammar(currSchemaDoc.fTargetNamespace); +                        \
currSchemaDoc.fDefaultOpenContent = \
fComplexTypeTraverser.traverseOpenContent(globalComp, currSchemaDoc, currSG, true); + \
DOMUtil.setHidden(globalComp, fHiddenNodes);  dependenciesCanOccur = false;
                         continue;
                     }
@@ -1624,23 +1626,6 @@ public class XSDHandler {
                     \
currSG.addAnnotation(fElementTraverser.traverseAnnotationDecl(globalComp, \
currSchemaDoc.getSchemaAttrs(), true, currSchemaDoc));  sawAnnotation = true;
                 }
-                else if (fSchemaVersion == Constants.SCHEMA_VERSION_1_1) {
-                    if (componentType.equals(SchemaSymbols.ELT_DEFAULTOPENCONTENT)) \
                {
-                        currSchemaDoc.fDefaultOpenContent = \
                fComplexTypeTraverser.traverseOpenContent(globalComp, currSchemaDoc, \
                currSG, true);
-                    }
-                    // if component is of override type - currently we do not
-                    // attempt to validate <override> Element since it will
-                    // be reflected on schema anyway
-                    //
-                    // REVISIT - is it required to validate Override components
-                    // that do not affect any schema..?
-                    else if (componentType.equals(SchemaSymbols.ELT_OVERRIDE)){
-                        continue;
-                    }
-                    else {
-                        reportSchemaError("s4s-elt-invalid-content.1", new Object [] \
                {SchemaSymbols.ELT_SCHEMA, DOMUtil.getLocalName(globalComp)}, \
                globalComp);
-                    }
-                }
                 else {
                     reportSchemaError("s4s-elt-invalid-content.1", new Object [] \
{SchemaSymbols.ELT_SCHEMA, DOMUtil.getLocalName(globalComp)}, globalComp);  }



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


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