Author: mukulg
Date: Sun Dec 4 09:49:28 2011
New Revision: 1210087
URL: http://svn.apache.org/viewvc?rev=1210087&view=rev
Log:
an W3C XSD 1.1 test case requires that, if a complexType overrides a simpleType
(or vice versa, if a simpleType overrides a complexType) with the same name
then that is not an error.
earlier we were raising an error for this condition. i've changed the
implementation to raise a warning instead for this case, and we then also
comply to this test case.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java?rev=1210087&r1=1210086&r2=1210087&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java
Sun Dec 4 09:49:28 2011
@@ -174,7 +174,7 @@ public final class DOMOverrideImpl exten
if (componentType == OVERRIDE_TYPE_DEFINITION) {
final String overridingLocalName =
getLocalName(newNode.originalElement);
if (!localName.equals(overridingLocalName)) {
-
fSchemaHandler.reportSchemaError("src-override-transformation.1", new
Object[]{overridingLocalName, localName, componentName},
newNode.originalElement);
+
fSchemaHandler.reportSchemaWarning("src-override-transformation.1", new
Object[]{overridingLocalName, localName, componentName},
newNode.originalElement);
if (isOverrideRoot){
newNode.overrideCloned = true;
}
@@ -251,7 +251,7 @@ public final class DOMOverrideImpl exten
}
private int getOverrideType(String localName){
- if (localName.equals(SchemaSymbols.ELT_SIMPLETYPE) ||
localName.equals(SchemaSymbols.ELT_COMPLEXTYPE )){
+ if (localName.equals(SchemaSymbols.ELT_SIMPLETYPE) ||
localName.equals(SchemaSymbols.ELT_COMPLEXTYPE)){
return OVERRIDE_TYPE_DEFINITION;
}
else if (localName.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP) ){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
