You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2011/12/06 14:47:52 UTC
svn commit: r1210915 - in
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override:
DOMOverrideImpl.java OverrideTransformer.java
Author: sandygao
Date: Tue Dec 6 13:47:51 2011
New Revision: 1210915
URL: http://svn.apache.org/viewvc?rev=1210915&view=rev
Log:
Fix the last few schema 1.1 failures: a) unrecognized block names in regular expressions are not errors; they match all characters. b) new rules about '-' in regular expressions. c) wildcard unions are always expressible d) override allows simple type and complex type have the same name. Only the actual match will be used. The other is ignored.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/DOMOverrideImpl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/OverrideTransformer.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=1210915&r1=1210914&r2=1210915&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 Tue Dec 6 13:47:51 2011
@@ -41,7 +41,7 @@ public final class DOMOverrideImpl exten
private final ArrayList fOverrideComponents = new ArrayList();
private final HashMap[] fOverrideComponentsMap = new HashMap[] {
null, new HashMap(), new HashMap(), new HashMap(),
- new HashMap(), new HashMap(), new HashMap()
+ new HashMap(), new HashMap(), new HashMap(), new HashMap()
};
// overridden schema document
@@ -171,16 +171,6 @@ public final class DOMOverrideImpl exten
Element oldNode = child;
//check if element needs to be overridden
if (newNode != null){
- if (componentType == OVERRIDE_TYPE_DEFINITION) {
- final String overridingLocalName = getLocalName(newNode.originalElement);
- if (!localName.equals(overridingLocalName)) {
- fSchemaHandler.reportSchemaWarning("src-override-transformation.1", new Object[]{overridingLocalName, localName, componentName}, newNode.originalElement);
- if (isOverrideRoot){
- newNode.overrideCloned = true;
- }
- continue;
- }
- }
child = performDOMOverride(overridenSchemaRoot, newNode.originalElement, oldNode);
if (!child.isEqualNode(oldNode)) {
hasPerformedTransformations = true;
@@ -251,8 +241,11 @@ public final class DOMOverrideImpl exten
}
private int getOverrideType(String localName){
- if (localName.equals(SchemaSymbols.ELT_SIMPLETYPE) || localName.equals(SchemaSymbols.ELT_COMPLEXTYPE)){
- return OVERRIDE_TYPE_DEFINITION;
+ if (localName.equals(SchemaSymbols.ELT_SIMPLETYPE)){
+ return OVERRIDE_SIMPLE_TYPE;
+ }
+ else if (localName.equals(SchemaSymbols.ELT_COMPLEXTYPE )){
+ return OVERRIDE_COMPLEX_TYPE;
}
else if (localName.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP) ){
return OVERRIDE_ATTRIBUTE_GROUP;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/OverrideTransformer.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/OverrideTransformer.java?rev=1210915&r1=1210914&r2=1210915&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/OverrideTransformer.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/override/OverrideTransformer.java Tue Dec 6 13:47:51 2011
@@ -27,12 +27,13 @@ public abstract class OverrideTransforme
// different type definitions needed to record type of OverrideElement
// before processing is done
- protected final static int OVERRIDE_TYPE_DEFINITION = 1 ;
- protected final static int OVERRIDE_ATTRIBUTE_GROUP = 2 ;
- protected final static int OVERRIDE_GROUP = 3 ;
- protected final static int OVERRIDE_ELEMENT = 4 ;
- protected final static int OVERRIDE_NOTATION = 5 ;
- protected final static int OVERRIDE_ATTRIBUTE = 6 ;
+ protected final static int OVERRIDE_SIMPLE_TYPE = 1 ;
+ protected final static int OVERRIDE_COMPLEX_TYPE = 2 ;
+ protected final static int OVERRIDE_ATTRIBUTE_GROUP = 3 ;
+ protected final static int OVERRIDE_GROUP = 4 ;
+ protected final static int OVERRIDE_ELEMENT = 5 ;
+ protected final static int OVERRIDE_NOTATION = 6 ;
+ protected final static int OVERRIDE_ATTRIBUTE = 7 ;
// Constructor - not accessible
protected OverrideTransformer(){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org