You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by je...@locus.apache.org on 2000/06/21 02:16:54 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/datatype DatatypeValidatorFactoryImpl.java StringDatatypeValidator.java
jeffreyr 00/06/20 17:16:52
Modified: java/src/org/apache/xerces/validators/datatype
DatatypeValidatorFactoryImpl.java
StringDatatypeValidator.java
Log:
It enables character class subtraction like [a-z-[c]] and fixes some bugs. Kento Tamura fix
Revision Changes Path
1.10 +2 -1 xml-xerces/java/src/org/apache/xerces/validators/datatype/DatatypeValidatorFactoryImpl.java
Index: DatatypeValidatorFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/DatatypeValidatorFactoryImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatatypeValidatorFactoryImpl.java 2000/06/20 15:41:40 1.9
+++ DatatypeValidatorFactoryImpl.java 2000/06/21 00:16:45 1.10
@@ -67,7 +67,7 @@
/**
- * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.9 2000/06/20 15:41:40 jeffreyr Exp $
+ * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.10 2000/06/21 00:16:45 jeffreyr Exp $
* @author Jeffrey Rodriguez
*/
@@ -350,6 +350,7 @@
if( fDebug ) {
System.out.println( "type = >" + type +"<");
System.out.println( "fRegistry = >" + fRegistry +"<" );
+ simpleType = (AbstractDatatypeValidator) fRegistry.get(type);
}
if ( type != null && fRegistry != null
&& fRegistry.containsKey( type ) == true ) {
1.8 +3 -1 xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java
Index: StringDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StringDatatypeValidator.java 2000/06/20 21:36:08 1.7
+++ StringDatatypeValidator.java 2000/06/21 00:16:46 1.8
@@ -73,7 +73,7 @@
* @author Ted Leung
* @author Kito D. Mann, Virtua Communications Corp.
* @author Jeffrey Rodriguez
- * @version $Id: StringDatatypeValidator.java,v 1.7 2000/06/20 21:36:08 jeffreyr Exp $
+ * @version $Id: StringDatatypeValidator.java,v 1.8 2000/06/21 00:16:46 jeffreyr Exp $
*/
public class StringDatatypeValidator extends AbstractDatatypeValidator{
private Locale fLocale = null;
@@ -378,7 +378,9 @@
if ( (fFacetsDefined & DatatypeValidator.FACET_PATTERN ) != 0 ) {
- RegularExpression regex = new RegularExpression(fPattern, "X" );
+ //System.out.println( "pattern = " + fPattern );
+ RegularExpression regex = new RegularExpression(fPattern );
+ //System.out.println("value = '" + content +"'." );
if ( regex.matches( content) == false )
throw new InvalidDatatypeValueException("Value'"+content+
"' does not match regular expression facet'" + fPattern + "'." );