sandygao 2002/11/08 08:46:39 Modified: java/src/org/apache/xerces/impl/dv/xs FullDVFactory.java SchemaDVFactoryImpl.java Log: Changed the pattern facet of the "language" type as required by erratum E2-25. Revision Changes Path 1.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java Index: FullDVFactory.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/dv/xs/FullDVFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FullDVFactory.java 30 Jul 2002 23:12:29 -0000 1.1 +++ FullDVFactory.java 8 Nov 2002 16:46:39 -0000 1.2 @@ -153,7 +153,7 @@ types.put(TOKEN, tokenDV); facets.whiteSpace = XSSimpleType.WS_COLLAPSE; - facets.pattern = "([a-zA-Z]{2}|[iI]-[a-zA-Z]+|[xX]-[a-zA-Z]+)(-[a-zA-Z]+)*"; + facets.pattern = "([a-zA-Z]{1,8})(-[a-zA-Z0-9]{1,8})*"; XSSimpleTypeDecl languageDV = new XSSimpleTypeDecl(tokenDV, LANGUAGE , URI_SCHEMAFORSCHEMA, (short)0, false); languageDV.applyFacets1(facets, (short)(XSSimpleType.FACET_WHITESPACE | XSSimpleType.FACET_PATTERN) ,(short)0); types.put(LANGUAGE, languageDV); 1.9 +2 -2 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SchemaDVFactoryImpl.java 19 Jul 2002 15:51:18 -0000 1.8 +++ SchemaDVFactoryImpl.java 8 Nov 2002 16:46:39 -0000 1.9 @@ -329,7 +329,7 @@ fBuiltInTypes.put(TOKEN, tokenDV); facets.whiteSpace = XSSimpleType.WS_COLLAPSE; - facets.pattern = "([a-zA-Z]{2}|[iI]-[a-zA-Z]+|[xX]-[a-zA-Z]+)(-[a-zA-Z]+)*"; + facets.pattern = "([a-zA-Z]{1,8})(-[a-zA-Z0-9]{1,8})*"; XSSimpleTypeDecl languageDV = new XSSimpleTypeDecl(tokenDV, LANGUAGE , URI_SCHEMAFORSCHEMA, (short)0, false); languageDV.applyFacets1(facets, (short)(XSSimpleType.FACET_WHITESPACE | XSSimpleType.FACET_PATTERN) ,(short)0); fBuiltInTypes.put(LANGUAGE, languageDV);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]