You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2005/06/13 06:55:30 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/xs XSConstants.java
mrglavas 2005/06/12 21:55:30
Modified: java/src/org/apache/xerces/impl/dv/xs XSSimpleTypeDecl.java
SchemaDVFactoryImpl.java
java/src/org/apache/xerces/xs XSConstants.java
Log:
Fixing incompatible change made to XSConstants for XML Schema 1.1 support.
Revision Changes Path
1.71 +8 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
Index: XSSimpleTypeDecl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- XSSimpleTypeDecl.java 25 May 2005 01:37:46 -0000 1.70
+++ XSSimpleTypeDecl.java 13 Jun 2005 04:55:30 -0000 1.71
@@ -172,6 +172,12 @@
static final String URI_SCHEMAFORSCHEMA = "http://www.w3.org/2001/XMLSchema";
static final String ANY_TYPE = "anyType";
+
+ // XML Schema 1.1 type constants
+ public static final short YEARMONTHDURATION_DT = 46;
+ public static final short DAYTIMEDURATION_DT = 47;
+ public static final short PRECISIONDECIMAL_DT = 48;
+ public static final short ANYATOMICTYPE_DT = 49;
// DOM Level 3 TypeInfo Derivation Method constants
static final int DERIVATION_ANY = 0;
@@ -2710,7 +2716,7 @@
static final XSSimpleTypeDecl fAnySimpleType = new XSSimpleTypeDecl(null, "anySimpleType", DV_ANYSIMPLETYPE, ORDERED_FALSE, false, true, false, true, XSConstants.ANYSIMPLETYPE_DT);
- static final XSSimpleTypeDecl fAnyAtomicType = new XSSimpleTypeDecl(fAnySimpleType, "anyAtomicType", DV_ANYATOMICTYPE, ORDERED_FALSE, false, true, false, true, XSConstants.ANYATOMICTYPE_DT);
+ static final XSSimpleTypeDecl fAnyAtomicType = new XSSimpleTypeDecl(fAnySimpleType, "anyAtomicType", DV_ANYATOMICTYPE, ORDERED_FALSE, false, true, false, true, XSSimpleTypeDecl.ANYATOMICTYPE_DT);
/**
* Validation context used to validate facet values.
1.20 +5 -5 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java
Index: SchemaDVFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/SchemaDVFactoryImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SchemaDVFactoryImpl.java 6 Oct 2004 14:56:47 -0000 1.19
+++ SchemaDVFactoryImpl.java 13 Jun 2005 04:55:30 -0000 1.20
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -220,9 +220,9 @@
fBuiltInTypes.put(DURATION, durationDV);
if (Constants.SCHEMA_1_1_SUPPORT) {
- fBuiltInTypes.put(YEARMONTHDURATION, new XSSimpleTypeDecl(durationDV, YEARMONTHDURATION, XSSimpleTypeDecl.DV_YEARMONTHDURATION, XSSimpleType.ORDERED_PARTIAL, false, false, false, true, XSConstants.YEARMONTHDURATION_DT));
- fBuiltInTypes.put(DAYTIMEDURATION, new XSSimpleTypeDecl(durationDV, DAYTIMEDURATION, XSSimpleTypeDecl.DV_DAYTIMEDURATION, XSSimpleType.ORDERED_PARTIAL, false, false, false, true, XSConstants.DAYTIMEDURATION_DT));
- //fBuiltInTypes.put(PRECISIONDECIMAL, new XSSimpleTypeDecl(anySimpleType, PRECISIONDECIMAL, XSSimpleTypeDecl.DV_PRECISIONDECIMAL, XSSimpleType.ORDERED_PARTIAL, false, false, true, true, XSConstants.PRECISIONDECIMAL_DT));
+ fBuiltInTypes.put(YEARMONTHDURATION, new XSSimpleTypeDecl(durationDV, YEARMONTHDURATION, XSSimpleTypeDecl.DV_YEARMONTHDURATION, XSSimpleType.ORDERED_PARTIAL, false, false, false, true, XSSimpleTypeDecl.YEARMONTHDURATION_DT));
+ fBuiltInTypes.put(DAYTIMEDURATION, new XSSimpleTypeDecl(durationDV, DAYTIMEDURATION, XSSimpleTypeDecl.DV_DAYTIMEDURATION, XSSimpleType.ORDERED_PARTIAL, false, false, false, true, XSSimpleTypeDecl.DAYTIMEDURATION_DT));
+ fBuiltInTypes.put(PRECISIONDECIMAL, new XSSimpleTypeDecl(anySimpleType, PRECISIONDECIMAL, XSSimpleTypeDecl.DV_PRECISIONDECIMAL, XSSimpleType.ORDERED_PARTIAL, false, false, true, true, XSSimpleTypeDecl.PRECISIONDECIMAL_DT));
}
fBuiltInTypes.put(DATETIME, new XSSimpleTypeDecl(baseAtomicType, DATETIME, XSSimpleTypeDecl.DV_DATETIME, XSSimpleType.ORDERED_PARTIAL, false, false, false, true, XSConstants.DATETIME_DT));
1.7 +4 -30 xml-xerces/java/src/org/apache/xerces/xs/XSConstants.java
Index: XSConstants.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xs/XSConstants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSConstants.java 30 Sep 2004 04:19:34 -0000 1.6
+++ XSConstants.java 13 Jun 2005 04:55:30 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * Copyright 2003,2004 The Apache Software Foundation.
+ * Copyright 2003-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -316,36 +316,10 @@
/**
* The type represents a list type definition.
*/
- public static final short LIST_DT = 44;
- /**
- * yearMonthDuration
- *
- * The type represents a type derived from duration to
- * represent a restricted duration containing only year
- * and month from the duration value space.
- */
- public static final short YEARMONTHDURATION_DT = 45;
- /**
- * dayTimeDuration
- *
- * The type represents a type derived from duration to
- * represent a restricted duration containing the day and
- * time portion of the duration value space.
- */
- public static final short DAYTIMEDURATION_DT = 46;
- /**
- * precisionDecimal
- *
- * The type represents new datatype introduced in Schema 1.1
- */
- public static final short PRECISIONDECIMAL_DT = 47;
- /**
- * anyAtomicType
- */
- public static final short ANYATOMICTYPE_DT = 48;
+ public static final short LIST_DT = 44;
/**
* The built-in type category is not available.
*/
- public static final short UNAVAILABLE_DT = 49;
-
+ public static final short UNAVAILABLE_DT = 45;
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org