You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2009/12/01 16:37:30 UTC
svn commit: r885800 - in /xerces/java/branches/xml-schema-1.1-dev:
samples/simpletype/ samples/xni/ src/org/apache/xerces/impl/dv/
src/org/apache/xerces/impl/dv/xs/ src/org/apache/xerces/impl/validation/
src/org/apache/xerces/impl/xs/ src/org/apache/xe...
Author: knoaman
Date: Tue Dec 1 15:37:29 2009
New Revision: 885800
URL: http://svn.apache.org/viewvc?rev=885800&view=rev
Log:
Define additional 1.1 facets and move inquiry of allowed facets to a type validator helper to differentiate between 1.0 types vs. 1.1 types.
Added:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java (with props)
Modified:
xerces/java/branches/xml-schema-1.1-dev/samples/simpletype/SimpleTypeUsage.java
xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ValidationContext.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSSimpleType.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BooleanDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DecimalDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DoubleDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/EntityDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FloatDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDREFDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ListDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/QNameDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/StringDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/UnionDV.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDelegate.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSFacet.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSMultiValueFacet.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java
Modified: xerces/java/branches/xml-schema-1.1-dev/samples/simpletype/SimpleTypeUsage.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/simpletype/SimpleTypeUsage.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/simpletype/SimpleTypeUsage.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/simpletype/SimpleTypeUsage.java Tue Dec 1 15:37:29 2009
@@ -191,7 +191,7 @@
// 'facets' property
// gives bit combination of the constants defined in XSSimpleType interface.
- short facets = simpleType.getDefinedFacets() ;
+ int facets = simpleType.getDefinedFacets() ;
printFacets(facets);
//'final' property
@@ -270,7 +270,7 @@
}//printCardinality()
-void printFacets(short facets){
+void printFacets(int facets){
System.err.println("'facets' present \t\t: " );
Modified: xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/xni/PSVIWriter.java Tue Dec 1 15:37:29 2009
@@ -2118,7 +2118,7 @@
}
}
- private String translateFacetKind(short kind) {
+ private String translateFacetKind(int kind) {
switch (kind) {
case XSSimpleTypeDefinition.FACET_WHITESPACE :
return SchemaSymbols.ELT_WHITESPACE;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ValidationContext.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ValidationContext.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ValidationContext.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/ValidationContext.java Tue Dec 1 15:37:29 2009
@@ -19,6 +19,8 @@
import java.util.Locale;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
+
/**
* ValidationContext has all the information required for the
* validation of: id, idref, entity, notation, qname
@@ -60,4 +62,7 @@
// Locale
public Locale getLocale();
+
+ // TypeValidatorHelper
+ public TypeValidatorHelper getTypeValidatorHelper();
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSSimpleType.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSSimpleType.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSSimpleType.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/XSSimpleType.java Tue Dec 1 15:37:29 2009
@@ -151,7 +151,7 @@
* @param context the validation context
* @exception InvalidDatatypeFacetException exception for invalid facet values.
*/
- public void applyFacets(XSFacets facets, short presentFacet, short fixedFacet, ValidationContext context)
+ public void applyFacets(XSFacets facets, int presentFacet, int fixedFacet, ValidationContext context)
throws InvalidDatatypeFacetException;
/**
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AbstractDateTimeDV.java Tue Dec 1 15:37:29 2009
@@ -62,10 +62,6 @@
protected final DatatypeFactory factory = new DatatypeFactoryImpl();
- public short getAllowedFacets(){
- return ( XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE | XSSimpleTypeDecl.FACET_ENUMERATION |XSSimpleTypeDecl.FACET_MAXINCLUSIVE |XSSimpleTypeDecl.FACET_MININCLUSIVE | XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE );
- }//getAllowedFacets()
-
// distinguishes between identity and equality for date/time values
// ie: two values representing the same "moment in time" but with different
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyAtomicDV.java Tue Dec 1 15:37:29 2009
@@ -30,11 +30,7 @@
* @version $Id$
*/
class AnyAtomicDV extends TypeValidator {
-
- public short getAllowedFacets() {
- return 0;
- }
-
+
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
return content;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnySimpleDV.java Tue Dec 1 15:37:29 2009
@@ -32,11 +32,6 @@
*/
public class AnySimpleDV extends TypeValidator {
- public short getAllowedFacets() {
- // anySimpleType doesn't allow any facet, not even whiteSpace
- return 0;
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
return content;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/AnyURIDV.java Tue Dec 1 15:37:29 2009
@@ -43,10 +43,6 @@
BASE_URI = uri;
}
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
// before we return string we have to make sure it is correct URI as per spec.
// for some types (string and derived), they just return the string itself
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Base64BinaryDV.java Tue Dec 1 15:37:29 2009
@@ -34,10 +34,6 @@
*/
public class Base64BinaryDV extends TypeValidator {
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
byte[] decoded = Base64.decode(content);
if (decoded == null)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BooleanDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BooleanDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BooleanDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BooleanDV.java Tue Dec 1 15:37:29 2009
@@ -32,10 +32,6 @@
*/
public class BooleanDV extends TypeValidator {
- public short getAllowedFacets() {
- return (XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE);
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
if ("false".equals(content) || "0".equals(content)) {
return Boolean.FALSE;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DecimalDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DecimalDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DecimalDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DecimalDV.java Tue Dec 1 15:37:29 2009
@@ -36,10 +36,6 @@
*/
public class DecimalDV extends TypeValidator {
- public final short getAllowedFacets(){
- return ( XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE | XSSimpleTypeDecl.FACET_ENUMERATION |XSSimpleTypeDecl.FACET_MAXINCLUSIVE |XSSimpleTypeDecl.FACET_MININCLUSIVE | XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE | XSSimpleTypeDecl.FACET_TOTALDIGITS | XSSimpleTypeDecl.FACET_FRACTIONDIGITS);
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
try {
return new XDecimal(content);
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DoubleDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DoubleDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DoubleDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/DoubleDV.java Tue Dec 1 15:37:29 2009
@@ -33,10 +33,6 @@
*/
public class DoubleDV extends TypeValidator {
- public short getAllowedFacets(){
- return ( XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE | XSSimpleTypeDecl.FACET_ENUMERATION |XSSimpleTypeDecl.FACET_MAXINCLUSIVE |XSSimpleTypeDecl.FACET_MININCLUSIVE | XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE );
- }//getAllowedFacets()
-
//convert a String to Double form, we have to take care of cases specified in spec like INF, -INF and NaN
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
try{
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/EntityDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/EntityDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/EntityDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/EntityDV.java Tue Dec 1 15:37:29 2009
@@ -33,10 +33,6 @@
*/
public class EntityDV extends TypeValidator {
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
if (!XMLChar.isValidNCName(content)) {
throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "NCName"});
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ErrorDV.java Tue Dec 1 15:37:29 2009
@@ -31,10 +31,6 @@
*/
public class ErrorDV extends TypeValidator {
- public short getAllowedFacets() {
- return XSSimpleTypeDecl.FACET_NONE;
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "error"});
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FloatDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FloatDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FloatDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/FloatDV.java Tue Dec 1 15:37:29 2009
@@ -33,10 +33,6 @@
*/
public class FloatDV extends TypeValidator {
- public short getAllowedFacets(){
- return ( XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE | XSSimpleTypeDecl.FACET_ENUMERATION |XSSimpleTypeDecl.FACET_MAXINCLUSIVE |XSSimpleTypeDecl.FACET_MININCLUSIVE | XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE );
- }//getAllowedFacets()
-
//convert a String to Float form, we have to take care of cases specified in spec like INF, -INF and NaN
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
try{
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/HexBinaryDV.java Tue Dec 1 15:37:29 2009
@@ -34,10 +34,6 @@
*/
public class HexBinaryDV extends TypeValidator {
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
byte[] decoded = HexBin.decode(content);
if (decoded == null)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDDV.java Tue Dec 1 15:37:29 2009
@@ -33,10 +33,6 @@
*/
public class IDDV extends TypeValidator{
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
if (!XMLChar.isValidNCName(content)) {
throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "NCName"});
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDREFDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDREFDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDREFDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/IDREFDV.java Tue Dec 1 15:37:29 2009
@@ -33,10 +33,6 @@
*/
public class IDREFDV extends TypeValidator{
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException {
if (!XMLChar.isValidNCName(content)) {
throw new InvalidDatatypeValueException("cvc-datatype-valid.1.2.1", new Object[]{content, "NCName"});
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ListDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ListDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ListDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/ListDV.java Tue Dec 1 15:37:29 2009
@@ -35,10 +35,6 @@
*/
public class ListDV extends TypeValidator{
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
// this method should never be called: XSSimpleTypeDecl is responsible for
// calling the item type for the convertion
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException{
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/PrecisionDecimalDV.java Tue Dec 1 15:37:29 2009
@@ -322,13 +322,6 @@
}
/* (non-Javadoc)
- * @see org.apache.xerces.impl.dv.xs.TypeValidator#getAllowedFacets()
- */
- public short getAllowedFacets() {
- return ( XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE | XSSimpleTypeDecl.FACET_ENUMERATION |XSSimpleTypeDecl.FACET_MAXINCLUSIVE |XSSimpleTypeDecl.FACET_MININCLUSIVE | XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE | XSSimpleTypeDecl.FACET_TOTALDIGITS | XSSimpleTypeDecl.FACET_FRACTIONDIGITS);
- }
-
- /* (non-Javadoc)
* @see org.apache.xerces.impl.dv.xs.TypeValidator#getActualValue(java.lang.String, org.apache.xerces.impl.dv.ValidationContext)
*/
public Object getActualValue(String content, ValidationContext context)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/QNameDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/QNameDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/QNameDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/QNameDV.java Tue Dec 1 15:37:29 2009
@@ -37,10 +37,6 @@
private static final String EMPTY_STRING = "".intern();
- public short getAllowedFacets() {
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE);
- }
-
public Object getActualValue(String content, ValidationContext context)
throws InvalidDatatypeValueException {
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/StringDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/StringDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/StringDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/StringDV.java Tue Dec 1 15:37:29 2009
@@ -32,10 +32,6 @@
*/
public class StringDV extends TypeValidator {
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_LENGTH | XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH | XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION | XSSimpleTypeDecl.FACET_WHITESPACE );
- }
-
public Object getActualValue(String content, ValidationContext context)
throws InvalidDatatypeValueException {
return content;
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidator.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidator.java Tue Dec 1 15:37:29 2009
@@ -35,9 +35,6 @@
*/
public abstract class TypeValidator {
- // which facets are allowed for this type
- public abstract short getAllowedFacets();
-
// convert a string to an actual value. for example,
// for number types (decimal, double, float, and types derived from them),
// get the BigDecimal, Double, Flout object.
Added: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java?rev=885800&view=auto
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java (added)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java Tue Dec 1 15:37:29 2009
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.xerces.impl.dv.xs;
+
+import org.apache.xerces.impl.Constants;
+
+/**
+ * @version $Id$
+ */
+public abstract class TypeValidatorHelper {
+
+ // Constants
+ private static int FACETS_GROUP1 = XSSimpleTypeDecl.FACET_NONE;
+
+ private static int FACETS_GROUP2 = XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_WHITESPACE;
+
+ private static int FACETS_GROUP3 = FACETS_GROUP2 | XSSimpleTypeDecl.FACET_LENGTH |
+ XSSimpleTypeDecl.FACET_MINLENGTH | XSSimpleTypeDecl.FACET_MAXLENGTH |
+ XSSimpleTypeDecl.FACET_ENUMERATION;
+
+ private static int FACETS_GROUP4 = FACETS_GROUP2 | XSSimpleTypeDecl.FACET_ENUMERATION |
+ XSSimpleTypeDecl.FACET_MAXINCLUSIVE | XSSimpleTypeDecl.FACET_MININCLUSIVE |
+ XSSimpleTypeDecl.FACET_MAXEXCLUSIVE | XSSimpleTypeDecl.FACET_MINEXCLUSIVE;
+
+ private static int FACETS_GROUP5 = FACETS_GROUP4 | XSSimpleTypeDecl.FACET_TOTALDIGITS |
+ XSSimpleTypeDecl.FACET_FRACTIONDIGITS;
+
+ private static int FACETS_GROUP6 = XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION;
+
+ private static int FACETS_GROUP7 = FACETS_GROUP2 | XSSimpleTypeDecl.FACET_ASSERT;
+
+ private static int FACETS_GROUP8 = FACETS_GROUP3 | XSSimpleTypeDecl.FACET_ASSERT;
+
+ private static int FACETS_GROUP9 = FACETS_GROUP4 | XSSimpleTypeDecl.FACET_ASSERT;
+
+ private static int FACETS_GROUP10 = FACETS_GROUP9 | XSSimpleTypeDecl.FACET_EXPLICITTIMEZONE;
+
+ private static int FACETS_GROUP11 = FACETS_GROUP5 | XSSimpleTypeDecl.FACET_ASSERT;
+
+ private static int FACETS_GROUP12 = FACETS_GROUP6 | XSSimpleTypeDecl.FACET_ASSERT;
+
+ private static int FACETS_GROUP13 = FACETS_GROUP11 | XSSimpleTypeDecl.FACET_MAXSCALE |
+ XSSimpleTypeDecl.FACET_MINSCALE;
+
+ // Static data
+ private static final TypeValidatorHelper fHelper1_0 = new TypeValidatorHelper1_0();
+ private static final TypeValidatorHelper fHelper1_1 = new TypeValidatorHelper1_1();
+
+ // Methods
+ public static TypeValidatorHelper getInstance(short schemaVersion) {
+ if (schemaVersion < Constants.SCHEMA_VERSION_1_1) {
+ return fHelper1_0;
+ }
+ return fHelper1_1;
+ }
+
+ public abstract int getAllowedFacets(short validationDV);
+
+ // Constructor
+ protected TypeValidatorHelper() {}
+
+ // Inner classes
+
+ // XML Schema 1.0
+ protected static class TypeValidatorHelper1_0 extends TypeValidatorHelper {
+
+ // Data
+ protected static int[] fAllowedFacets;
+
+ static {
+ createAllowedFacets();
+ }
+
+ // create allowed facets
+ static void createAllowedFacets() {
+ fAllowedFacets = new int[] {
+ FACETS_GROUP1, // anySimpleType
+ FACETS_GROUP3, // string
+ FACETS_GROUP2, // boolean
+ FACETS_GROUP5, // decimal
+ FACETS_GROUP4, // float
+ FACETS_GROUP4, // double
+ FACETS_GROUP4, // duration
+ FACETS_GROUP4, // dateTime
+ FACETS_GROUP4, // time
+ FACETS_GROUP4, // date
+ FACETS_GROUP4, // gYearMonth
+ FACETS_GROUP4, // gYear
+ FACETS_GROUP4, // gMonthDay
+ FACETS_GROUP4, // gDay
+ FACETS_GROUP4, // gMonth
+ FACETS_GROUP3, // hexBinary
+ FACETS_GROUP3, // base64Binary
+ FACETS_GROUP3, // anyURI
+ FACETS_GROUP3, // QName
+ FACETS_GROUP1, // precisionDecimal
+ FACETS_GROUP3, // NOTATION
+ FACETS_GROUP3, // ID
+ FACETS_GROUP3, // IDREF
+ FACETS_GROUP3, // ENTITY
+ FACETS_GROUP5, // integer
+ FACETS_GROUP3, // list
+ FACETS_GROUP6, // union
+ FACETS_GROUP1, // gYearMonthDuration
+ FACETS_GROUP1, // gDayTimeDuration
+ FACETS_GROUP1, // anyAtomic
+ FACETS_GROUP1, // error
+ FACETS_GROUP1 // dateTimeStamp
+ };
+ }
+
+ // TypeValidator abstract methods
+ public int getAllowedFacets(short validationDV) {
+ return (validationDV < fAllowedFacets.length) ? fAllowedFacets[validationDV] : FACETS_GROUP1;
+ }
+ }
+
+ // XML Schema 1.1
+ protected static class TypeValidatorHelper1_1 extends TypeValidatorHelper {
+
+ // Data
+ protected static int[] fAllowedFacets;
+
+ static {
+ createAllowedFacets();
+ }
+
+ // create allowed facets
+ static void createAllowedFacets() {
+ fAllowedFacets = new int[] {
+ FACETS_GROUP1, //anySimpleType
+ FACETS_GROUP8, // string
+ FACETS_GROUP7, // boolean
+ FACETS_GROUP11, // decimal
+ FACETS_GROUP9, // float
+ FACETS_GROUP9, // double
+ FACETS_GROUP9, // duration
+ FACETS_GROUP10, // dateTime
+ FACETS_GROUP10, // time
+ FACETS_GROUP10, // date
+ FACETS_GROUP10, // gYearMonth
+ FACETS_GROUP10, // gYear
+ FACETS_GROUP10, // gMonthDay
+ FACETS_GROUP10, // gDay
+ FACETS_GROUP10, // gMonth
+ FACETS_GROUP8, // hexBinary
+ FACETS_GROUP8, // base64Binary
+ FACETS_GROUP8, // anyURI
+ FACETS_GROUP8, // QName
+ FACETS_GROUP13, // precisionDecimal
+ FACETS_GROUP8, // NOTATION
+ FACETS_GROUP8, // ID
+ FACETS_GROUP8, // IDREF
+ FACETS_GROUP8, // ENTITY
+ FACETS_GROUP11, // integer
+ FACETS_GROUP8, // list
+ FACETS_GROUP12, // union
+ FACETS_GROUP9, // gYearMonthDuration
+ FACETS_GROUP9, // gDayTimeDuration
+ FACETS_GROUP1, // anyAtomic
+ FACETS_GROUP1, // error
+ FACETS_GROUP10 // dateTimeStamp
+ };
+ }
+
+ // TypeValidator abstract methods
+
+ public int getAllowedFacets(short validationDV) {
+ return (validationDV < fAllowedFacets.length) ? fAllowedFacets[validationDV] : FACETS_GROUP1;
+ }
+ }
+}
Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/TypeValidatorHelper.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/UnionDV.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/UnionDV.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/UnionDV.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/UnionDV.java Tue Dec 1 15:37:29 2009
@@ -32,10 +32,6 @@
*/
public class UnionDV extends TypeValidator{
- public short getAllowedFacets(){
- return (XSSimpleTypeDecl.FACET_PATTERN | XSSimpleTypeDecl.FACET_ENUMERATION );
- }
-
// this method should never be called: XSSimpleTypeDecl is responsible for
// calling the member types for the convertion
public Object getActualValue(String content, ValidationContext context) throws InvalidDatatypeValueException{
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDecl.java Tue Dec 1 15:37:29 2009
@@ -229,6 +229,9 @@
public Locale getLocale() {
return Locale.getDefault();
}
+ public TypeValidatorHelper getTypeValidatorHelper() {
+ return TypeValidatorHelper.getInstance(Constants.SCHEMA_VERSION_1_0);
+ }
};
protected static TypeValidator[] getGDVs() {
@@ -239,6 +242,10 @@
fDVs = dvs;
}
+
+ // Default TypeValidatorHelper
+ private static TypeValidatorHelper fDefaultTypeValidatorHelper = TypeValidatorHelper.getInstance(Constants.SCHEMA_VERSION_1_0);
+
// this will be true if this is a static XSSimpleTypeDecl
// and hence must remain immutable (i.e., applyFacets
// may not be permitted to have any effect).
@@ -256,8 +263,8 @@
private short fVariety = -1;
private short fValidationDV = -1;
- private short fFacetsDefined = 0;
- private short fFixedFacet = 0;
+ private int fFacetsDefined = 0;
+ private int fFixedFacet = 0;
//for constraining facets
private short fWhiteSpace = 0;
@@ -657,7 +664,7 @@
}
public short getPrimitiveKind() {
- if (fVariety == VARIETY_ATOMIC && fValidationDV != DV_ANYSIMPLETYPE) {
+ if (fVariety == VARIETY_ATOMIC && fValidationDV != DV_ANYSIMPLETYPE && fValidationDV != DV_ANYATOMICTYPE) {
if (fValidationDV == DV_ID || fValidationDV == DV_IDREF || fValidationDV == DV_ENTITY) {
return DV_STRING;
}
@@ -692,11 +699,12 @@
* definition) is available, otherwise <code>null</code>.
*/
public XSSimpleTypeDefinition getPrimitiveType() {
- if (fVariety == VARIETY_ATOMIC && fValidationDV != DV_ANYSIMPLETYPE) {
+ if (fVariety == VARIETY_ATOMIC && fValidationDV != DV_ANYSIMPLETYPE && fValidationDV != DV_ANYATOMICTYPE) {
XSSimpleTypeDecl pri = this;
// recursively get base, until we reach anySimpleType
- while (pri.fBase != fAnySimpleType)
+ while (pri.fBase != fAnySimpleType && pri.fBase != fAnyAtomicType) {
pri = pri.fBase;
+ }
return pri;
}
else {
@@ -737,7 +745,7 @@
/**
* If <restriction> is chosen
*/
- public void applyFacets(XSFacets facets, short presentFacet, short fixedFacet, ValidationContext context)
+ public void applyFacets(XSFacets facets, int presentFacet, int fixedFacet, ValidationContext context)
throws InvalidDatatypeFacetException {
if (context == null) {
context = fEmptyContext;
@@ -748,7 +756,7 @@
/**
* built-in derived types by restriction
*/
- void applyFacets1(XSFacets facets, short presentFacet, short fixedFacet) {
+ void applyFacets1(XSFacets facets, int presentFacet, int fixedFacet) {
try {
applyFacets(facets, presentFacet, fixedFacet, SPECIAL_PATTERN_NONE, fDummyContext);
@@ -763,7 +771,7 @@
/**
* built-in derived types by restriction
*/
- void applyFacets1(XSFacets facets, short presentFacet, short fixedFacet, short patternType) {
+ void applyFacets1(XSFacets facets, int presentFacet, int fixedFacet, short patternType) {
try {
applyFacets(facets, presentFacet, fixedFacet, patternType, fDummyContext);
@@ -778,7 +786,7 @@
/**
* If <restriction> is chosen, or built-in derived types by restriction
*/
- void applyFacets(XSFacets facets, short presentFacet, short fixedFacet, short patternType, ValidationContext context)
+ void applyFacets(XSFacets facets, int presentFacet, int fixedFacet, short patternType, ValidationContext context)
throws InvalidDatatypeFacetException {
// if the object is immutable, should not apply facets...
@@ -798,7 +806,12 @@
int result = 0 ;
// step 1: parse present facets
- short allowedFacet = fDVs[fValidationDV].getAllowedFacets();
+ TypeValidatorHelper typeValidatorHelper = context.getTypeValidatorHelper();
+ if (typeValidatorHelper == null) {
+ // fall back to 1.0 simple types
+ typeValidatorHelper = fDefaultTypeValidatorHelper;
+ }
+ int allowedFacet = typeValidatorHelper.getAllowedFacets(fValidationDV);
// length
if ((presentFacet & FACET_LENGTH) != 0) {
@@ -2148,7 +2161,7 @@
* @param facetName The name of the facet.
* @return True if the facet is defined, false otherwise.
*/
- public boolean isDefinedFacet(short facetName) {
+ public boolean isDefinedFacet(int facetName) {
if ((fFacetsDefined & facetName) != 0)
return true;
if (fPatternType != SPECIAL_PATTERN_NONE)
@@ -2162,11 +2175,11 @@
* [facets]: all facets defined on this type. The value is a bit
* combination of FACET_XXX constants of all defined facets.
*/
- public short getDefinedFacets() {
+ public int getDefinedFacets() {
if (fPatternType != SPECIAL_PATTERN_NONE)
- return (short)(fFacetsDefined | FACET_PATTERN);
+ return fFacetsDefined | FACET_PATTERN;
if (fValidationDV == DV_INTEGER)
- return (short)(fFacetsDefined | FACET_PATTERN | FACET_FRACTIONDIGITS);
+ return fFacetsDefined | FACET_PATTERN | FACET_FRACTIONDIGITS;
return fFacetsDefined;
}
@@ -2176,7 +2189,7 @@
* @param facetName The name of the facet.
* @return True if the facet is fixed, false otherwise.
*/
- public boolean isFixedFacet(short facetName) {
+ public boolean isFixedFacet(int facetName) {
if ((fFixedFacet & facetName) != 0)
return true;
if (fValidationDV == DV_INTEGER)
@@ -2187,9 +2200,9 @@
/**
* [facets]: all defined facets for this type which are fixed.
*/
- public short getFixedFacets() {
+ public int getFixedFacets() {
if (fValidationDV == DV_INTEGER)
- return (short)(fFixedFacet | FACET_FRACTIONDIGITS);
+ return fFixedFacet | FACET_FRACTIONDIGITS;
return fFixedFacet;
}
@@ -2205,7 +2218,7 @@
* @return A value of the facet specified in <code>facetName</code> for
* this simple type definition or <code>null</code>.
*/
- public String getLexicalFacetValue(short facetName) {
+ public String getLexicalFacetValue(int facetName) {
switch (facetName) {
case FACET_LENGTH:
return (fLength == -1)?null:Integer.toString(fLength);
@@ -2899,6 +2912,10 @@
public Locale getLocale() {
return Locale.getDefault();
}
+
+ public TypeValidatorHelper getTypeValidatorHelper() {
+ return TypeValidatorHelper.getInstance(Constants.SCHEMA_VERSION_1_0);
+ }
};
private boolean fAnonymous = false;
@@ -2971,6 +2988,10 @@
public Locale getLocale() {
return fExternal.getLocale();
}
+
+ public TypeValidatorHelper getTypeValidatorHelper() {
+ return fExternal.getTypeValidatorHelper();
+ }
}
public void reset(){
@@ -3225,12 +3246,12 @@
}
private static final class XSFacetImpl implements XSFacet {
- final short kind;
+ final int kind;
final String value;
final boolean fixed;
final XSObjectList annotations;
- public XSFacetImpl(short kind, String value, boolean fixed, XSAnnotation annotation) {
+ public XSFacetImpl(int kind, String value, boolean fixed, XSAnnotation annotation) {
this.kind = kind;
this.value = value;
this.fixed = fixed;
@@ -3271,7 +3292,7 @@
/* (non-Javadoc)
* @see org.apache.xerces.xs.XSFacet#getFacetKind()
*/
- public short getFacetKind() {
+ public int getFacetKind() {
return kind;
}
@@ -3321,12 +3342,12 @@
}
private static final class XSMVFacetImpl implements XSMultiValueFacet {
- final short kind;
+ final int kind;
final XSObjectList annotations;
final StringList values;
final Vector asserts;
- public XSMVFacetImpl(short kind, StringList values, XSObjectList annotations) {
+ public XSMVFacetImpl(int kind, StringList values, XSObjectList annotations) {
this.kind = kind;
this.values = values;
this.annotations = (annotations != null) ? annotations : XSObjectListImpl.EMPTY_LIST;
@@ -3335,7 +3356,7 @@
/*
* overloaded constructor. added to support assertions.
*/
- public XSMVFacetImpl(short kind, Vector asserts) {
+ public XSMVFacetImpl(int kind, Vector asserts) {
this.kind = kind;
this.asserts = asserts;
this.values = null;
@@ -3345,7 +3366,7 @@
/* (non-Javadoc)
* @see org.apache.xerces.xs.XSFacet#getFacetKind()
*/
- public short getFacetKind() {
+ public int getFacetKind() {
return kind;
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDelegate.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDelegate.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDelegate.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/XSSimpleTypeDelegate.java Tue Dec 1 15:37:29 2009
@@ -61,7 +61,7 @@
return type.getBuiltInKind();
}
- public short getDefinedFacets() {
+ public int getDefinedFacets() {
return type.getDefinedFacets();
}
@@ -73,7 +73,7 @@
return type.getFinite();
}
- public short getFixedFacets() {
+ public int getFixedFacets() {
return type.getFixedFacets();
}
@@ -85,7 +85,7 @@
return type.getLexicalEnumeration();
}
- public String getLexicalFacetValue(short facetName) {
+ public String getLexicalFacetValue(int facetName) {
return type.getLexicalFacetValue(facetName);
}
@@ -117,11 +117,11 @@
return type.getVariety();
}
- public boolean isDefinedFacet(short facetName) {
+ public boolean isDefinedFacet(int facetName) {
return type.isDefinedFacet(facetName);
}
- public boolean isFixedFacet(short facetName) {
+ public boolean isFixedFacet(int facetName) {
return type.isFixedFacet(facetName);
}
@@ -169,7 +169,7 @@
return type.getType();
}
- public void applyFacets(XSFacets facets, short presentFacet, short fixedFacet, ValidationContext context)
+ public void applyFacets(XSFacets facets, int presentFacet, int fixedFacet, ValidationContext context)
throws InvalidDatatypeFacetException {
type.applyFacets(facets, presentFacet, fixedFacet, context);
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/validation/ValidationState.java Tue Dec 1 15:37:29 2009
@@ -22,6 +22,7 @@
import java.util.Locale;
import org.apache.xerces.impl.dv.ValidationContext;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.NamespaceContext;
@@ -53,6 +54,8 @@
private final HashMap fIdTable = new HashMap();
private final HashMap fIdRefTable = new HashMap();
private final static Object fNullValue = new Object();
+
+ private TypeValidatorHelper fTypeValidatorHelper = null;
//
// public methods
@@ -199,4 +202,14 @@
public Locale getLocale() {
return fLocale;
}
+
+ // TypeValidatorHelper
+
+ public void setTypeValidatorHelper(TypeValidatorHelper typeValidatorHelper) {
+ fTypeValidatorHelper = typeValidatorHelper;
+ }
+
+ public TypeValidatorHelper getTypeValidatorHelper() {
+ return fTypeValidatorHelper;
+ }
}
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java Tue Dec 1 15:37:29 2009
@@ -36,6 +36,7 @@
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
import org.apache.xerces.impl.dv.ValidatedInfo;
import org.apache.xerces.impl.dv.XSSimpleType;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
import org.apache.xerces.impl.validation.ConfigurableValidationState;
import org.apache.xerces.impl.validation.ValidationManager;
@@ -1553,9 +1554,12 @@
fEntityResolver = (XMLEntityResolver) componentManager.getProperty(ENTITY_MANAGER);
+ final TypeValidatorHelper typeValidatorHelper = TypeValidatorHelper.getInstance(fSchemaVersion);
+
fValidationManager = (ValidationManager) componentManager.getProperty(VALIDATION_MANAGER);
fValidationManager.addValidationState(fValidationState);
fValidationState.setSymbolTable(fSymbolTable);
+ fValidationState.setTypeValidatorHelper(typeValidatorHelper);
try {
final Object rootType = componentManager.getProperty(ROOT_TYPE_DEF);
@@ -1673,6 +1677,9 @@
fState4XsiType.setSymbolTable(symbolTable);
fState4ApplyDefault.setSymbolTable(symbolTable);
+
+ fState4XsiType.setTypeValidatorHelper(typeValidatorHelper);
+ fState4ApplyDefault.setTypeValidatorHelper(typeValidatorHelper);
} // reset(XMLComponentManager)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java Tue Dec 1 15:37:29 2009
@@ -24,6 +24,7 @@
import org.apache.xerces.impl.dv.InvalidDatatypeValueException;
import org.apache.xerces.impl.dv.XSFacets;
import org.apache.xerces.impl.dv.XSSimpleType;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
import org.apache.xerces.impl.validation.ValidationState;
import org.apache.xerces.impl.xpath.XPath20Assert;
import org.apache.xerces.impl.xs.SchemaGrammar;
@@ -105,6 +106,7 @@
fValidationState.setExtraChecking(false);
fValidationState.setSymbolTable(symbolTable);
fValidationState.setLocale(locale);
+ fValidationState.setTypeValidatorHelper(fSchemaHandler.fTypeValidatorHelper);
}
// traverse the annotation declaration
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/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=885800&r1=885799&r2=885800&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 Tue Dec 1 15:37:29 2009
@@ -37,6 +37,7 @@
import org.apache.xerces.impl.dv.SchemaDVFactory;
import org.apache.xerces.impl.dv.xs.DecimalDV;
import org.apache.xerces.impl.dv.xs.TypeValidator;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
import org.apache.xerces.impl.xs.SchemaGrammar;
import org.apache.xerces.impl.xs.SchemaNamespaceSupport;
@@ -443,6 +444,9 @@
// XML Schema constraint checker
XSConstraints fXSConstraints;
+ // TypeValidatorHelper
+ TypeValidatorHelper fTypeValidatorHelper;
+
// these data members are needed for the deferred traversal
// of local elements.
@@ -812,7 +816,7 @@
XSDocumentInfo currSchemaInfo = null;
try {
// note that attributes are freed at end of traverseSchemas()
- currSchemaInfo = new XSDocumentInfo(schemaRoot, fAttributeChecker, fSymbolTable);
+ currSchemaInfo = new XSDocumentInfo(schemaRoot, fAttributeChecker, fSymbolTable, fTypeValidatorHelper);
} catch (XMLSchemaException se) {
reportSchemaError(ELE_ERROR_CODES[referType],
new Object[]{locationHint},
@@ -3689,6 +3693,8 @@
} catch (XMLConfigurationException e) {
}
+ fTypeValidatorHelper = TypeValidatorHelper.getInstance(fSchemaVersion);
+
} // reset(XMLComponentManager)
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDocumentInfo.java Tue Dec 1 15:37:29 2009
@@ -20,6 +20,7 @@
import java.util.Stack;
import java.util.Vector;
+import org.apache.xerces.impl.dv.xs.TypeValidatorHelper;
import org.apache.xerces.impl.validation.ValidationState;
import org.apache.xerces.impl.xs.SchemaNamespaceSupport;
import org.apache.xerces.impl.xs.SchemaSymbols;
@@ -100,7 +101,7 @@
// note that the caller must ensure to call returnSchemaAttrs()
// to avoid memory leaks!
- XSDocumentInfo (Element schemaRoot, XSAttributeChecker attrChecker, SymbolTable symbolTable)
+ XSDocumentInfo (Element schemaRoot, XSAttributeChecker attrChecker, SymbolTable symbolTable, TypeValidatorHelper typeValidatorHelper)
throws XMLSchemaException {
fSchemaElement = schemaRoot;
@@ -117,6 +118,7 @@
// set namespace support
fValidationContext.setNamespaceSupport(fNamespaceSupport);
fValidationContext.setSymbolTable(symbolTable);
+ fValidationContext.setTypeValidatorHelper(typeValidatorHelper);
fSchemaAttrs = attrChecker.checkAttributes(root, true, this);
// schemaAttrs == null means it's not an <xsd:schema> element
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSFacet.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSFacet.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSFacet.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSFacet.java Tue Dec 1 15:37:29 2009
@@ -26,7 +26,7 @@
* The name of the facet, e.g. <code>FACET_LENGTH, FACET_TOTALDIGITS</code>
* (see <code>XSSimpleTypeDefinition</code>).
*/
- public short getFacetKind();
+ public int getFacetKind();
/**
* A value of this facet.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSMultiValueFacet.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSMultiValueFacet.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSMultiValueFacet.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSMultiValueFacet.java Tue Dec 1 15:37:29 2009
@@ -27,7 +27,7 @@
* The name of the facet, i.e. <code>FACET_ENUMERATION</code> and
* <code>FACET_PATTERN</code> (see <code>XSSimpleTypeDefinition</code>).
*/
- public short getFacetKind();
+ public int getFacetKind();
/**
* Values of this facet.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java?rev=885800&r1=885799&r2=885800&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xs/XSSimpleTypeDefinition.java Tue Dec 1 15:37:29 2009
@@ -48,60 +48,75 @@
/**
* No facets defined.
*/
- public static final short FACET_NONE = 0;
+ public static final int FACET_NONE = 0;
/**
* 4.3.1 Length
*/
- public static final short FACET_LENGTH = 1;
+ public static final int FACET_LENGTH = 1;
/**
* 4.3.2 minLength.
*/
- public static final short FACET_MINLENGTH = 2;
+ public static final int FACET_MINLENGTH = 2;
/**
* 4.3.3 maxLength.
*/
- public static final short FACET_MAXLENGTH = 4;
+ public static final int FACET_MAXLENGTH = 4;
/**
* 4.3.4 pattern.
*/
- public static final short FACET_PATTERN = 8;
+ public static final int FACET_PATTERN = 8;
/**
- * 4.3.5 whitespace.
+ * 4.3.6 whitespace.
*/
- public static final short FACET_WHITESPACE = 16;
+ public static final int FACET_WHITESPACE = 16;
/**
* 4.3.7 maxInclusive.
*/
- public static final short FACET_MAXINCLUSIVE = 32;
+ public static final int FACET_MAXINCLUSIVE = 32;
/**
* 4.3.9 maxExclusive.
*/
- public static final short FACET_MAXEXCLUSIVE = 64;
+ public static final int FACET_MAXEXCLUSIVE = 64;
/**
* 4.3.9 minExclusive.
*/
- public static final short FACET_MINEXCLUSIVE = 128;
+ public static final int FACET_MINEXCLUSIVE = 128;
/**
* 4.3.10 minInclusive.
*/
- public static final short FACET_MININCLUSIVE = 256;
+ public static final int FACET_MININCLUSIVE = 256;
/**
* 4.3.11 totalDigits .
*/
- public static final short FACET_TOTALDIGITS = 512;
+ public static final int FACET_TOTALDIGITS = 512;
/**
* 4.3.12 fractionDigits.
*/
- public static final short FACET_FRACTIONDIGITS = 1024;
+ public static final int FACET_FRACTIONDIGITS = 1024;
/**
* 4.3.5 enumeration.
*/
- public static final short FACET_ENUMERATION = 2048;
+ public static final int FACET_ENUMERATION = 2048;
/**
- * 'assertion' facet introduced in XML Schema 1.1
+ * 4.3.13 maxScale (XML Schema 1.1)
*/
- public static final short FACET_ASSERT = 4096;
+ public static final int FACET_MAXSCALE = 4096;
+
+ /**
+ * 4.3.14 minScale (XML Schema 1.1)
+ */
+ public static final int FACET_MINSCALE = 8192;
+
+ /**
+ * 4.3.15 assert (XML Schema 1.1)
+ */
+ public static final int FACET_ASSERT = 16384;
+
+ /**
+ * 4.3.16 explicitTimeZone (XML Schema 1.1)
+ */
+ public static final int FACET_EXPLICITTIMEZONE = 32768;
/**
* A constant defined for the 'ordered' fundamental facet: not ordered.
@@ -153,7 +168,7 @@
* [facets]: all facets defined on this type. The value is a bit
* combination of FACET_XXX constants of all defined facets.
*/
- public short getDefinedFacets();
+ public int getDefinedFacets();
/**
* Convenience method. [Facets]: check whether a facet is defined on this
@@ -161,12 +176,12 @@
* @param facetName The name of the facet.
* @return True if the facet is defined, false otherwise.
*/
- public boolean isDefinedFacet(short facetName);
+ public boolean isDefinedFacet(int facetName);
/**
* [facets]: all defined facets for this type which are fixed.
*/
- public short getFixedFacets();
+ public int getFixedFacets();
/**
* Convenience method. [Facets]: check whether a facet is defined and
@@ -174,7 +189,7 @@
* @param facetName The name of the facet.
* @return True if the facet is fixed, false otherwise.
*/
- public boolean isFixedFacet(short facetName);
+ public boolean isFixedFacet(int facetName);
/**
* Convenience method. Returns a value of a single constraining facet for
@@ -188,7 +203,7 @@
* @return A value of the facet specified in <code>facetName</code> for
* this simple type definition or <code>null</code>.
*/
- public String getLexicalFacetValue(short facetName);
+ public String getLexicalFacetValue(int facetName);
/**
* A list of enumeration values if it exists, otherwise an empty
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org