Author: knoaman
Date: Sat Aug 14 16:16:36 2010
New Revision: 985524
URL: http://svn.apache.org/viewvc?rev=985524&view=rev
Log:
ENTITIES, IDREFS, NMTOKENS have anyAtomicType as base in XML Schema 1.1
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseSchemaDVFactory.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.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/BaseSchemaDVFactory.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseSchemaDVFactory.java?rev=985524&r1=985523&r2=985524&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseSchemaDVFactory.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/BaseSchemaDVFactory.java
Sat Aug 14 16:16:36 2010
@@ -220,31 +220,31 @@ public abstract class BaseSchemaDVFactor
XSSimpleTypeDecl idrefDV = new XSSimpleTypeDecl(ncnameDV, IDREF ,
XSSimpleTypeDecl.DV_IDREF, XSSimpleType.ORDERED_FALSE, false, false, false,
true, XSConstants.IDREF_DT);
builtInTypes.put(IDREF, idrefDV);
- facets.minLength = 1;
+ /*facets.minLength = 1;
XSSimpleTypeDecl tempDV = new XSSimpleTypeDecl(null,
URI_SCHEMAFORSCHEMA, (short)0, idrefDV, true, null);
XSSimpleTypeDecl idrefsDV = new XSSimpleTypeDecl(tempDV, IDREFS,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
idrefsDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH, (short)0);
- builtInTypes.put(IDREFS, idrefsDV);
+ builtInTypes.put(IDREFS, idrefsDV);*/
XSSimpleTypeDecl entityDV = new XSSimpleTypeDecl(ncnameDV, ENTITY ,
XSSimpleTypeDecl.DV_ENTITY, XSSimpleType.ORDERED_FALSE, false, false, false,
true, XSConstants.ENTITY_DT);
builtInTypes.put(ENTITY, entityDV);
- facets.minLength = 1;
+ /*facets.minLength = 1;
tempDV = new XSSimpleTypeDecl(null, URI_SCHEMAFORSCHEMA, (short)0,
entityDV, true, null);
XSSimpleTypeDecl entitiesDV = new XSSimpleTypeDecl(tempDV, ENTITIES,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
entitiesDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
- builtInTypes.put(ENTITIES, entitiesDV);
+ builtInTypes.put(ENTITIES, entitiesDV);*/
facets.whiteSpace = XSSimpleType.WS_COLLAPSE;
XSSimpleTypeDecl nmtokenDV = new XSSimpleTypeDecl(tokenDV, NMTOKEN,
URI_SCHEMAFORSCHEMA, (short)0, false, null, XSConstants.NMTOKEN_DT);
nmtokenDV.applyFacets1(facets, XSSimpleType.FACET_WHITESPACE,
(short)0, XSSimpleTypeDecl.SPECIAL_PATTERN_NMTOKEN);
builtInTypes.put(NMTOKEN, nmtokenDV);
- facets.minLength = 1;
+ /*facets.minLength = 1;
tempDV = new XSSimpleTypeDecl(null, URI_SCHEMAFORSCHEMA, (short)0,
nmtokenDV, true, null);
XSSimpleTypeDecl nmtokensDV = new XSSimpleTypeDecl(tempDV, NMTOKENS,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
nmtokensDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
- builtInTypes.put(NMTOKENS, nmtokensDV);
+ builtInTypes.put(NMTOKENS, nmtokensDV);*/
} //createBuiltInTypes()
/**
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.java?rev=985524&r1=985523&r2=985524&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.java
Sat Aug 14 16:16:36 2010
@@ -17,8 +17,10 @@
package org.apache.xerces.impl.dv.xs;
+import org.apache.xerces.impl.dv.XSFacets;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.util.SymbolHash;
+import org.apache.xerces.xs.XSConstants;
/**
* A special factory to create/return built-in schema DVs and create
user-defined DVs
@@ -47,6 +49,9 @@ public class Schema11DVFactoryImpl exten
final String ERROR = "error";
final String DATETIMESTAMP = "dateTimeStamp";
final String DATETIME = "dateTime";
+ final String ENTITIES = "ENTITIES";
+ final String NMTOKENS = "NMTOKENS";
+ final String IDREFS = "IDREFS";
createBuiltInTypes(fBuiltInTypes, XSSimpleTypeDecl.fAnyAtomicType);
@@ -56,6 +61,26 @@ public class Schema11DVFactoryImpl exten
// add error
fBuiltInTypes.put(ERROR, XSSimpleTypeDecl.fError);
+ // In XML Schema 1.1, ENTITIES, NMTOKENS, IDREFS have anyAtomicType
+ // as the base type
+ final XSFacets facets = new XSFacets();
+ facets.minLength = 1;
+
+ // add ENTITIES
+ final XSSimpleTypeDecl entitiesDV = new
XSSimpleTypeDecl(XSSimpleTypeDecl.fAnyAtomicType, ENTITIES,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ entitiesDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
+ fBuiltInTypes.put(ENTITIES, entitiesDV);
+
+ // add NMTOKENS
+ final XSSimpleTypeDecl nmtokensDV = new
XSSimpleTypeDecl(XSSimpleTypeDecl.fAnyAtomicType, NMTOKENS,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ nmtokensDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
+ fBuiltInTypes.put(NMTOKENS, nmtokensDV);
+
+ // add IDREFS
+ final XSSimpleTypeDecl idrefsDV = new
XSSimpleTypeDecl(XSSimpleTypeDecl.fAnyAtomicType, IDREFS, URI_SCHEMAFORSCHEMA,
(short)0, false, null);
+ idrefsDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH, (short)0);
+ fBuiltInTypes.put(IDREFS, idrefsDV);
+
// add 2 duration types
XSSimpleTypeDecl durationDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(DURATION);
fBuiltInTypes.put(YEARMONTHDURATION, new XSSimpleTypeDecl(durationDV,
YEARMONTHDURATION, XSSimpleTypeDecl.DV_YEARMONTHDURATION,
XSSimpleType.ORDERED_PARTIAL, false, false, false, true,
XSSimpleTypeDecl.YEARMONTHDURATION_DT));
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=985524&r1=985523&r2=985524&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
Sat Aug 14 16:16:36 2010
@@ -17,6 +17,7 @@
package org.apache.xerces.impl.dv.xs;
+import org.apache.xerces.impl.dv.XSFacets;
import org.apache.xerces.impl.dv.XSSimpleType;
import org.apache.xerces.util.SymbolHash;
@@ -40,8 +41,39 @@ public class SchemaDVFactoryImpl extends
// create all built-in types
static void createBuiltInTypes() {
+ final String ENTITIES = "ENTITIES";
+ final String ENTITY = "ENTITY";
+ final String NMTOKENS = "NMTOKENS";
+ final String NMTOKEN = "NMTOKEN";
+ final String IDREFS = "IDREFS";
+ final String IDREF = "IDREF";
+
createBuiltInTypes(fBuiltInTypes, XSSimpleTypeDecl.fAnySimpleType);
+ XSFacets facets = new XSFacets();
+ facets.minLength = 1;
+
+ // add ENTITIES
+ final XSSimpleTypeDecl entityDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(ENTITY);
+ XSSimpleTypeDecl tempDV = new XSSimpleTypeDecl(null,
URI_SCHEMAFORSCHEMA, (short)0, entityDV, true, null);
+ final XSSimpleTypeDecl entitiesDV = new XSSimpleTypeDecl(tempDV,
ENTITIES, URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ entitiesDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
+ fBuiltInTypes.put(ENTITIES, entitiesDV);
+
+ // add NMTOKENS
+ final XSSimpleTypeDecl nmtokenDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(NMTOKEN);
+ tempDV = new XSSimpleTypeDecl(null, URI_SCHEMAFORSCHEMA, (short)0,
nmtokenDV, true, null);
+ final XSSimpleTypeDecl nmtokensDV = new XSSimpleTypeDecl(tempDV,
NMTOKENS, URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ nmtokensDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH,
(short)0);
+ fBuiltInTypes.put(NMTOKENS, nmtokensDV);
+
+ // add IDREFS
+ final XSSimpleTypeDecl idrefDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(IDREF);
+ tempDV = new XSSimpleTypeDecl(null, URI_SCHEMAFORSCHEMA, (short)0,
idrefDV, true, null);
+ final XSSimpleTypeDecl idrefsDV = new XSSimpleTypeDecl(tempDV, IDREFS,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ idrefsDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH, (short)0);
+ fBuiltInTypes.put(IDREFS, idrefsDV);
+
// TODO: move specific 1.0 DV implementation from base
} //createBuiltInTypes()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
