Author: mrglavas
Date: Fri Jul 11 13:11:57 2008
New Revision: 676066

URL: http://svn.apache.org/viewvc?rev=676066&view=rev
Log:
Fixing a bug in the construction of the simple type hierarchy. The base type of 
xs:negativeInteger is xs:nonPositiveInteger not xs:integer.

Modified:
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java?rev=676066&r1=676065&r2=676066&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseDVFactory.java
 Fri Jul 11 13:11:57 2008
@@ -184,7 +184,7 @@
         types.put(NONPOSITIVEINTEGER, nonPositiveDV);
 
         facets.maxInclusive = "-1";
-        XSSimpleTypeDecl negativeDV = new XSSimpleTypeDecl(integerDV, 
NEGATIVEINTEGER, URI_SCHEMAFORSCHEMA, (short)0, false, null, 
XSConstants.NEGATIVEINTEGER_DT);
+        XSSimpleTypeDecl negativeDV = new XSSimpleTypeDecl(nonPositiveDV, 
NEGATIVEINTEGER, URI_SCHEMAFORSCHEMA, (short)0, false, null, 
XSConstants.NEGATIVEINTEGER_DT);
         negativeDV.applyFacets1(facets , XSSimpleType.FACET_MAXINCLUSIVE, 
(short)0);
         types.put(NEGATIVEINTEGER, negativeDV);
 

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java?rev=676066&r1=676065&r2=676066&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java
 Fri Jul 11 13:11:57 2008
@@ -244,7 +244,7 @@
         fBuiltInTypes.put(NONPOSITIVEINTEGER, nonPositiveDV);
 
         facets.maxInclusive = "-1";
-        XSSimpleTypeDecl negativeDV = new XSSimpleTypeDecl(integerDV, 
NEGATIVEINTEGER, URI_SCHEMAFORSCHEMA, (short)0, false, null, 
XSConstants.NEGATIVEINTEGER_DT);
+        XSSimpleTypeDecl negativeDV = new XSSimpleTypeDecl(nonPositiveDV, 
NEGATIVEINTEGER, URI_SCHEMAFORSCHEMA, (short)0, false, null, 
XSConstants.NEGATIVEINTEGER_DT);
         negativeDV.applyFacets1(facets , XSSimpleType.FACET_MAXINCLUSIVE, 
(short)0);
         fBuiltInTypes.put(NEGATIVEINTEGER, negativeDV);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to