Author: knoaman
Date: Sat Aug 14 19:12:52 2010
New Revision: 985567
URL: http://svn.apache.org/viewvc?rev=985567&view=rev
Log:
ENTITIES, IDREFS, NMTOKENS have anySimpleType as base in XML Schema 1.1
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dv/xs/Schema11DVFactoryImpl.java
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=985567&r1=985566&r2=985567&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 19:12:52 2010
@@ -50,8 +50,11 @@ public class Schema11DVFactoryImpl exten
final String DATETIMESTAMP = "dateTimeStamp";
final String DATETIME = "dateTime";
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.fAnyAtomicType);
@@ -67,17 +70,20 @@ public class Schema11DVFactoryImpl exten
facets.minLength = 1;
// add ENTITIES
- final XSSimpleTypeDecl entitiesDV = new
XSSimpleTypeDecl(XSSimpleTypeDecl.fAnyAtomicType, ENTITIES,
URI_SCHEMAFORSCHEMA, (short)0, false, null);
+ final XSSimpleTypeDecl entityDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(ENTITY);
+ final XSSimpleTypeDecl entitiesDV = new XSSimpleTypeDecl(ENTITIES,
URI_SCHEMAFORSCHEMA, (short)0, entityDV, 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);
+ final XSSimpleTypeDecl nmtokenDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(NMTOKEN);
+ final XSSimpleTypeDecl nmtokensDV = new XSSimpleTypeDecl(NMTOKENS,
URI_SCHEMAFORSCHEMA, (short)0, nmtokenDV, 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);
+ final XSSimpleTypeDecl idrefDV =
(XSSimpleTypeDecl)fBuiltInTypes.get(IDREF);
+ final XSSimpleTypeDecl idrefsDV = new XSSimpleTypeDecl(IDREFS,
URI_SCHEMAFORSCHEMA, (short)0, idrefDV, false, null);
idrefsDV.applyFacets1(facets, XSSimpleType.FACET_MINLENGTH, (short)0);
fBuiltInTypes.put(IDREFS, idrefsDV);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
