You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2001/10/16 19:21:42 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/impl/validation ValidationContext.java ValidationState.java

elena       01/10/16 10:21:42

  Modified:    java/src/org/apache/xerces/impl/v2 XSDHandler.java
                        XSMixedCM.java XSSimpleCM.java
               java/src/org/apache/xerces/impl/v2/datatypes
                        AbstractDatatypeValidator.java
                        AbstractNumericFacetValidator.java
                        AbstractNumericValidator.java
                        AbstractStringValidator.java AnySimpleType.java
                        AnyURIDatatypeValidator.java
                        Base64BinaryDatatypeValidator.java
                        BooleanDatatypeValidator.java
                        DatatypeMessageProvider.java DatatypeValidator.java
                        DatatypeValidatorFactoryImpl.java
                        DateDatatypeValidator.java
                        DateTimeDatatypeValidator.java
                        DateTimeValidator.java DayDatatypeValidator.java
                        DecimalDatatypeValidator.java
                        DoubleDatatypeValidator.java
                        DurationDatatypeValidator.java
                        EntityDatatypeValidator.java
                        FloatDatatypeValidator.java
                        HexBinaryDatatypeValidator.java
                        IDDatatypeValidator.java
                        IDREFDatatypeValidator.java
                        ListDatatypeValidator.java
                        MonthDatatypeValidator.java
                        MonthDayDatatypeValidator.java
                        NOTATIONDatatypeValidator.java
                        QNameDatatypeValidator.java
                        StringDatatypeValidator.java
                        TimeDatatypeValidator.java
                        UnionDatatypeValidator.java
                        YearDatatypeValidator.java
                        YearMonthDatatypeValidator.java
               java/src/org/apache/xerces/impl/validation
                        ValidationState.java
  Added:       java/src/org/apache/xerces/impl/validation
                        ValidationContext.java
  Removed:     java/src/org/apache/xerces/impl/v2/datatypes
                        ValidationContext.java
  Log:
  move ValidationContext interface to validation directory
  applied patches from Henry Zonharo for content models.
  
  Revision  Changes    Path
  1.42      +6 -6      xml-xerces/java/src/org/apache/xerces/impl/v2/XSDHandler.java
  
  Index: XSDHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDHandler.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- XSDHandler.java	2001/10/16 16:00:35	1.41
  +++ XSDHandler.java	2001/10/16 17:21:39	1.42
  @@ -97,7 +97,7 @@
    * schema, other grammars may be constructed as a side-effect.
    *
    * @author Neil Graham, IBM
  - * @version $Id: XSDHandler.java,v 1.41 2001/10/16 16:00:35 neilg Exp $
  + * @version $Id: XSDHandler.java,v 1.42 2001/10/16 17:21:39 elena Exp $
    */
   
   class XSDHandler {
  @@ -743,11 +743,11 @@
           if (retObj != null)
               return retObj;
   
  -		 // decl can be null, if the grammar picked was SG_SchemaNS
  -		 if (decl == null) {
  -		         fElementTraverser.reportGenericSchemaError("Could not locate a component corresponding to " +declToTraverse.uri+":"+declToTraverse.localpart);
  -		 		 return null;
  -		 }
  +	// decl can be null, if the grammar picked was SG_SchemaNS
  +	if (decl == null) {
  +	        fElementTraverser.reportGenericSchemaError("Could not locate a component corresponding to " +declToTraverse.uri+":"+declToTraverse.localpart);
  +		return null;
  +        }
           else if (DOMUtil.isHidden(decl)) {
               // decl must not be null if we're here...
               //REVISIT: report an error: circular reference
  
  
  
  1.3       +2 -9      xml-xerces/java/src/org/apache/xerces/impl/v2/XSMixedCM.java
  
  Index: XSMixedCM.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSMixedCM.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSMixedCM.java	2001/10/15 22:55:16	1.2
  +++ XSMixedCM.java	2001/10/16 17:21:39	1.3
  @@ -70,7 +70,7 @@
    *
    * @author Elena Litani
    * @author IBM
  - * @version $Id: XSMixedCM.java,v 1.2 2001/10/15 22:55:16 sandygao Exp $
  + * @version $Id: XSMixedCM.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class XSMixedCM  implements XSCMValidator {
   
  @@ -81,10 +81,6 @@
       // start the content model: did not see any children
       private static final short STATE_START = 0;
   
  -    //
  -    // Data
  -    //
  -    private int[] fState = {STATE_START};
   
   
       //
  @@ -98,7 +94,7 @@
        * @return Start state of the content model
        */
       public int[] startContentModel(){
  -        return fState;
  +        return (new int[] {STATE_START});    
       }
   
   
  @@ -132,9 +128,6 @@
       public boolean endContentModel (int[] currentState){
           boolean isFinal =  false;
           int state = currentState[0];
  -
  -        // restore content model state:
  -        fState[0] = STATE_START;
   
           // error
           if (state < 0) {
  
  
  
  1.7       +2 -6      xml-xerces/java/src/org/apache/xerces/impl/v2/XSSimpleCM.java
  
  Index: XSSimpleCM.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSSimpleCM.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSSimpleCM.java	2001/10/15 22:55:16	1.6
  +++ XSSimpleCM.java	2001/10/16 17:21:39	1.7
  @@ -81,7 +81,7 @@
    * This model validated on the way in.
    *
    * @author Elena Litani, IBM
  - * @version $Id: XSSimpleCM.java,v 1.6 2001/10/15 22:55:16 sandygao Exp $
  + * @version $Id: XSSimpleCM.java,v 1.7 2001/10/16 17:21:39 elena Exp $
    */
   public class XSSimpleCM
   implements XSCMValidator {
  @@ -99,7 +99,6 @@
       //
       // Data
       //
  -    private int[] fState = {STATE_START};
   
   
       // element declaration in the XML Schema grammar.
  @@ -155,7 +154,7 @@
        * @return Start state of the content model
        */
       public int[] startContentModel(){
  -        return fState;
  +        return (new int[] {STATE_START}); 
       }
   
   
  @@ -264,9 +263,6 @@
       public boolean endContentModel (int[] currentState){
           boolean isFinal =  false;
           int state = currentState[0];
  -
  -        // restore content model state:
  -        fState[0] = STATE_START;
   
           // error
           if (state < 0) {
  
  
  
  1.10      +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractDatatypeValidator.java
  
  Index: AbstractDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractDatatypeValidator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractDatatypeValidator.java	2001/10/16 15:11:38	1.9
  +++ AbstractDatatypeValidator.java	2001/10/16 17:21:39	1.10
  @@ -57,7 +57,7 @@
   
   
   /**
  - * @version $Id: AbstractDatatypeValidator.java,v 1.9 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: AbstractDatatypeValidator.java,v 1.10 2001/10/16 17:21:39 elena Exp $
    * @author  Elena Litani
    * @author  Jeffrey Rodriguez
   */
  @@ -70,6 +70,7 @@
   import java.util.Locale;
   import org.apache.xerces.impl.v2.XSTypeDecl;
   import org.apache.xerces.impl.XMLErrorReporter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   
  
  
  
  1.4       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericFacetValidator.java
  
  Index: AbstractNumericFacetValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericFacetValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractNumericFacetValidator.java	2001/10/11 15:13:33	1.3
  +++ AbstractNumericFacetValidator.java	2001/10/16 17:21:39	1.4
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * AbstractNumericFacetValidator is a base class for decimal, double, float,
  @@ -73,7 +74,7 @@
    * minInclusive, maxInclusive, minExclusive, maxExclusive according to schema specs.
    * 
    * @author Elena Litani
  - * @version $Id: AbstractNumericFacetValidator.java,v 1.3 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: AbstractNumericFacetValidator.java,v 1.4 2001/10/16 17:21:39 elena Exp $
    */
   
   public abstract class AbstractNumericFacetValidator extends AbstractDatatypeValidator {
  
  
  
  1.5       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericValidator.java
  
  Index: AbstractNumericValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractNumericValidator.java	2001/10/16 15:11:38	1.4
  +++ AbstractNumericValidator.java	2001/10/16 17:21:39	1.5
  @@ -68,12 +68,13 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * AbstractNumericValidator is a base class of decimal, double, and float 
    * schema datatypes
    * 
    * @author Elena Litani
  - * @version $Id: AbstractNumericValidator.java,v 1.4 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: AbstractNumericValidator.java,v 1.5 2001/10/16 17:21:39 elena Exp $
    */
   
   public abstract class AbstractNumericValidator extends AbstractNumericFacetValidator {
  
  
  
  1.9       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractStringValidator.java
  
  Index: AbstractStringValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractStringValidator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractStringValidator.java	2001/10/16 15:11:38	1.8
  +++ AbstractStringValidator.java	2001/10/16 17:21:39	1.9
  @@ -70,12 +70,13 @@
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
   
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * AbstractStringValidator is a base class for anyURI, string,
    * hexBinary, base64Binary, QName and Notation datatypes.
    *
    * @author Elena Litani
  - * @version $Id: AbstractStringValidator.java,v 1.8 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: AbstractStringValidator.java,v 1.9 2001/10/16 17:21:39 elena Exp $
    */
   public abstract class AbstractStringValidator extends AbstractDatatypeValidator {
   
  
  
  
  1.4       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AnySimpleType.java
  
  Index: AnySimpleType.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AnySimpleType.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AnySimpleType.java	2001/10/16 15:11:38	1.3
  +++ AnySimpleType.java	2001/10/16 17:21:39	1.4
  @@ -62,10 +62,11 @@
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
   
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * AnySimpleType is the base of all simple types.
    * @author Sandy Gao
  - * @version $Id: AnySimpleType.java,v 1.3 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: AnySimpleType.java,v 1.4 2001/10/16 17:21:39 elena Exp $
    */
   public class AnySimpleType extends AbstractDatatypeValidator {
       public  AnySimpleType() {
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AnyURIDatatypeValidator.java
  
  Index: AnyURIDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AnyURIDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AnyURIDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ AnyURIDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -63,6 +63,7 @@
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
   
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * URIValidator validates that XML content is a W3C uri type,
    * according to RFC 2396
  @@ -72,7 +73,7 @@
    * @author Mark Swinkles - List Validation refactoring
    * @see          RFC 2396
    * @see Tim Berners-Lee, et. al. RFC 2396: Uniform Resource Identifiers (URI): Generic Syntax.. 1998 Available at: http://www.ietf.org/rfc/rfc2396.txt
  - * @version  $Id: AnyURIDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version  $Id: AnyURIDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class AnyURIDatatypeValidator extends AbstractStringValidator {
       
  
  
  
  1.5       +3 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/Base64BinaryDatatypeValidator.java
  
  Index: Base64BinaryDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/Base64BinaryDatatypeValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Base64BinaryDatatypeValidator.java	2001/10/11 21:05:29	1.4
  +++ Base64BinaryDatatypeValidator.java	2001/10/16 17:21:39	1.5
  @@ -67,13 +67,15 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * Base64BinaryValidator validates that XML content is a W3C string type.
    * @author Ted Leung
    * @author Kito D. Mann, Virtua Communications Corp.
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: Base64BinaryDatatypeValidator.java,v 1.4 2001/10/11 21:05:29 elena Exp $
  + * @version $Id: Base64BinaryDatatypeValidator.java,v 1.5 2001/10/16 17:21:39 elena Exp $
    */
   public class Base64BinaryDatatypeValidator extends AbstractStringValidator{
       
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/BooleanDatatypeValidator.java
  
  Index: BooleanDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/BooleanDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BooleanDatatypeValidator.java	2001/10/16 15:11:38	1.5
  +++ BooleanDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -65,6 +65,7 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    *
    * BooleanValidator validates that content satisfies the W3C XML Datatype for Boolean
  @@ -72,7 +73,7 @@
    * @author Ted Leung
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version  $Id: BooleanDatatypeValidator.java,v 1.5 2001/10/16 15:11:38 elena Exp $
  + * @version  $Id: BooleanDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   
   public class BooleanDatatypeValidator extends AbstractDatatypeValidator {
  
  
  
  1.2       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeMessageProvider.java
  
  Index: DatatypeMessageProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeMessageProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DatatypeMessageProvider.java	2001/08/24 22:26:29	1.1
  +++ DatatypeMessageProvider.java	2001/10/16 17:21:39	1.2
  @@ -64,10 +64,11 @@
   import org.apache.xerces.util.MessageFormatter;
   
   
  +
   /**
    *
    * @author Jeffrey Rodriguez
  - * @version $Id: DatatypeMessageProvider.java,v 1.1 2001/08/24 22:26:29 elena Exp $
  + * @version $Id: DatatypeMessageProvider.java,v 1.2 2001/10/16 17:21:39 elena Exp $
    */
   public class DatatypeMessageProvider implements MessageFormatter {
       /**
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidator.java
  
  Index: DatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DatatypeValidator.java	2001/10/16 15:11:38	1.5
  +++ DatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -58,6 +58,7 @@
   package org.apache.xerces.impl.v2.datatypes;
   
   import org.apache.xerces.impl.v2.XSTypeDecl;
  +import org.apache.xerces.impl.validation.ValidationContext;
   import java.util.Hashtable;
   import java.util.Locale;
   
  @@ -69,7 +70,7 @@
    * W3C to remove facets from the data type spec.
    *
    * @author Jeffrey Rodriguez-
  - * @version $Id: DatatypeValidator.java,v 1.5 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: DatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   public interface DatatypeValidator extends XSTypeDecl {
       public static final short FACET_LENGTH       = 0x1<<0;
  
  
  
  1.4       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidatorFactoryImpl.java
  
  Index: DatatypeValidatorFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidatorFactoryImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DatatypeValidatorFactoryImpl.java	2001/10/11 15:42:44	1.3
  +++ DatatypeValidatorFactoryImpl.java	2001/10/16 17:21:39	1.4
  @@ -60,6 +60,7 @@
   import java.util.Vector;
   import java.lang.reflect.*;
   import org.apache.xerces.impl.v2.SchemaSymbols;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   
  @@ -89,7 +90,7 @@
    * @author Elena Litani
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.3 2001/10/11 15:42:44 elena Exp $
  + * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.4 2001/10/16 17:21:39 elena Exp $
    */
   public class DatatypeValidatorFactoryImpl implements DatatypeValidatorFactory {
   
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateDatatypeValidator.java
  
  Index: DateDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DateDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ DateDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -61,11 +61,12 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   /**
    * Validator for <date> datatype (W3C Schema datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: DateDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: DateDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class DateDatatypeValidator extends DateTimeValidator {
   
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateTimeDatatypeValidator.java
  
  Index: DateTimeDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateTimeDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DateTimeDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ DateTimeDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -60,13 +60,14 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   /**
    * Validator for <dateTime> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: DateTimeDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: DateTimeDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class DateTimeDatatypeValidator extends DateTimeValidator {
   
  
  
  
  1.7       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateTimeValidator.java
  
  Index: DateTimeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DateTimeValidator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DateTimeValidator.java	2001/10/16 15:11:38	1.6
  +++ DateTimeValidator.java	2001/10/16 17:21:39	1.7
  @@ -64,6 +64,7 @@
   import org.apache.xerces.impl.v2.SchemaSymbols;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   /**
  @@ -74,7 +75,7 @@
    * @author Elena Litani
    * @author Len Berman  
    *
  - * @version $Id: DateTimeValidator.java,v 1.6 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: DateTimeValidator.java,v 1.7 2001/10/16 17:21:39 elena Exp $
    */
   
   public abstract class DateTimeValidator extends AbstractNumericFacetValidator {
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DayDatatypeValidator.java
  
  Index: DayDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DayDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DayDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ DayDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -61,12 +61,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * Validator for <gDay> datatype (W3C Schema datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: DayDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: DayDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class DayDatatypeValidator extends DateTimeValidator {
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DecimalDatatypeValidator.java
  
  Index: DecimalDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DecimalDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DecimalDatatypeValidator.java	2001/10/11 21:05:29	1.5
  +++ DecimalDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    *
  @@ -75,7 +76,7 @@
    * @author Ted Leung
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: DecimalDatatypeValidator.java,v 1.5 2001/10/11 21:05:29 elena Exp $
  + * @version $Id: DecimalDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   
   public class DecimalDatatypeValidator extends AbstractNumericValidator {
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DoubleDatatypeValidator.java
  
  Index: DoubleDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DoubleDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DoubleDatatypeValidator.java	2001/10/11 21:05:29	1.5
  +++ DoubleDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -64,13 +64,14 @@
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * @author Elena Litani
    * @author Ted Leung
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: DoubleDatatypeValidator.java,v 1.5 2001/10/11 21:05:29 elena Exp $
  + * @version $Id: DoubleDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   
   public class DoubleDatatypeValidator extends AbstractNumericValidator {
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DurationDatatypeValidator.java
  
  Index: DurationDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DurationDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DurationDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ DurationDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -60,12 +60,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * Validator for <duration> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: DurationDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: DurationDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class DurationDatatypeValidator extends DateTimeValidator {
  
  
  
  1.2       +2 -0      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/EntityDatatypeValidator.java
  
  Index: EntityDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/EntityDatatypeValidator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EntityDatatypeValidator.java	2001/10/16 15:59:06	1.1
  +++ EntityDatatypeValidator.java	2001/10/16 17:21:39	1.2
  @@ -59,6 +59,8 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.validation.EntityState;
  +import org.apache.xerces.impl.validation.ValidationContext;
  +
   
   import java.util.Hashtable;
   /**
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/FloatDatatypeValidator.java
  
  Index: FloatDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/FloatDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FloatDatatypeValidator.java	2001/10/11 21:05:29	1.5
  +++ FloatDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -67,6 +67,7 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    *
  @@ -74,7 +75,7 @@
    * @author Ted Leung
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version  $Id: FloatDatatypeValidator.java,v 1.5 2001/10/11 21:05:29 elena Exp $
  + * @version  $Id: FloatDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   
   public class FloatDatatypeValidator extends AbstractNumericValidator {
  
  
  
  1.5       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/HexBinaryDatatypeValidator.java
  
  Index: HexBinaryDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/HexBinaryDatatypeValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HexBinaryDatatypeValidator.java	2001/10/11 21:05:29	1.4
  +++ HexBinaryDatatypeValidator.java	2001/10/16 17:21:39	1.5
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.v2.util.HexBin;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * HexBinaryValidator validates that XML content is a W3C string type.
  @@ -73,7 +74,7 @@
    * @author Kito D. Mann, Virtua Communications Corp.
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: HexBinaryDatatypeValidator.java,v 1.4 2001/10/11 21:05:29 elena Exp $
  + * @version $Id: HexBinaryDatatypeValidator.java,v 1.5 2001/10/16 17:21:39 elena Exp $
    */
   public class HexBinaryDatatypeValidator extends AbstractStringValidator{
       
  
  
  
  1.6       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/IDDatatypeValidator.java
  
  Index: IDDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/IDDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IDDatatypeValidator.java	2001/10/16 15:11:38	1.5
  +++ IDDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -65,6 +65,7 @@
   import org.apache.xerces.impl.v2.SchemaSymbols;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * DataTypeValidator defines the interface that data type validators must obey.
  @@ -72,7 +73,7 @@
    * standalone code as well as plugins to the validator architecture.
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: IDDatatypeValidator.java,v 1.5 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: IDDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   public class IDDatatypeValidator extends StringDatatypeValidator {
   
  
  
  
  1.7       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/IDREFDatatypeValidator.java
  
  Index: IDREFDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/IDREFDatatypeValidator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IDREFDatatypeValidator.java	2001/10/16 15:11:38	1.6
  +++ IDREFDatatypeValidator.java	2001/10/16 17:21:39	1.7
  @@ -65,6 +65,7 @@
   import org.apache.xerces.impl.v2.SchemaSymbols;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * IDREFValidator defines the interface that data type validators must obey.
  @@ -73,7 +74,7 @@
    *
    * @author Jeffrey Rodriguez-
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: IDREFDatatypeValidator.java,v 1.6 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: IDREFDatatypeValidator.java,v 1.7 2001/10/16 17:21:39 elena Exp $
    */
   public class IDREFDatatypeValidator extends StringDatatypeValidator {
       private static Object                   fNullValue      = new Object();
  
  
  
  1.6       +3 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/ListDatatypeValidator.java
  
  Index: ListDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/ListDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ListDatatypeValidator.java	2001/10/16 15:11:38	1.5
  +++ ListDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -67,12 +67,14 @@
   
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
  +
   /**
    * StringValidator validates that XML content is a W3C string type.
    * @author  Elena Litani
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: ListDatatypeValidator.java,v 1.5 2001/10/16 15:11:38 elena Exp $
  + * @version $Id: ListDatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
    */
   public class ListDatatypeValidator extends AbstractDatatypeValidator {
   
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/MonthDatatypeValidator.java
  
  Index: MonthDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/MonthDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MonthDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ MonthDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -60,12 +60,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * Validator for <gMonth> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: MonthDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: MonthDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class MonthDatatypeValidator extends DateTimeValidator {
  
  
  
  1.3       +3 -2      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/MonthDayDatatypeValidator.java
  
  Index: MonthDayDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/MonthDayDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MonthDayDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ MonthDayDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -59,14 +59,15 @@
   package org.apache.xerces.impl.v2.datatypes;
   
   import java.util.Hashtable;
  - import org.apache.xerces.impl.XMLErrorReporter;
  +import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * Validator for <gMonthDay> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: MonthDayDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: MonthDayDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class MonthDayDatatypeValidator extends DateTimeValidator {
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/NOTATIONDatatypeValidator.java
  
  Index: NOTATIONDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/NOTATIONDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NOTATIONDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ NOTATIONDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -61,6 +61,7 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   /**
  @@ -71,7 +72,7 @@
    * @author Elena Litani
    * @author Jeffrey Rodriguez-
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: NOTATIONDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: NOTATIONDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class NOTATIONDatatypeValidator extends AbstractStringValidator {
       
  
  
  
  1.4       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/QNameDatatypeValidator.java
  
  Index: QNameDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/QNameDatatypeValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- QNameDatatypeValidator.java	2001/10/11 15:13:33	1.3
  +++ QNameDatatypeValidator.java	2001/10/16 17:21:39	1.4
  @@ -63,6 +63,7 @@
   import org.apache.xerces.impl.v2.SchemaSymbols;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * QName Validator validates a QName type.
  @@ -76,7 +77,7 @@
    *
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: QNameDatatypeValidator.java,v 1.3 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: QNameDatatypeValidator.java,v 1.4 2001/10/16 17:21:39 elena Exp $
    */
   public class QNameDatatypeValidator extends  AbstractStringValidator {
   
  
  
  
  1.5       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/StringDatatypeValidator.java
  
  Index: StringDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/StringDatatypeValidator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StringDatatypeValidator.java	2001/10/11 21:05:29	1.4
  +++ StringDatatypeValidator.java	2001/10/16 17:21:39	1.5
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   /**
  @@ -74,7 +75,7 @@
    * @author Kito D. Mann, Virtua Communications Corp.
    * @author Jeffrey Rodriguez
    * @author Mark Swinkles - List Validation refactoring
  - * @version $Id: StringDatatypeValidator.java,v 1.4 2001/10/11 21:05:29 elena Exp $
  + * @version $Id: StringDatatypeValidator.java,v 1.5 2001/10/16 17:21:39 elena Exp $
    */
   public class StringDatatypeValidator extends AbstractStringValidator {
   
  
  
  
  1.3       +2 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/TimeDatatypeValidator.java
  
  Index: TimeDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/TimeDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TimeDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ TimeDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -61,12 +61,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   /**
    * Validator for <time> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: TimeDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: TimeDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   public class TimeDatatypeValidator extends DateTimeValidator {
   
  
  
  
  1.6       +1 -0      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/UnionDatatypeValidator.java
  
  Index: UnionDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/UnionDatatypeValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UnionDatatypeValidator.java	2001/10/16 15:11:38	1.5
  +++ UnionDatatypeValidator.java	2001/10/16 17:21:39	1.6
  @@ -66,6 +66,7 @@
   import org.apache.xerces.impl.v2.util.regex.RegularExpression;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
   
   
   
  
  
  
  1.3       +3 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/YearDatatypeValidator.java
  
  Index: YearDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/YearDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- YearDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ YearDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -63,11 +63,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
  +
   /**
    * Validator for <gYear> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: YearDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: YearDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class YearDatatypeValidator extends DateTimeValidator {
  
  
  
  1.3       +3 -1      xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/YearMonthDatatypeValidator.java
  
  Index: YearMonthDatatypeValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/YearMonthDatatypeValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- YearMonthDatatypeValidator.java	2001/10/11 15:13:33	1.2
  +++ YearMonthDatatypeValidator.java	2001/10/16 17:21:39	1.3
  @@ -60,11 +60,13 @@
   import java.util.Hashtable;
   import org.apache.xerces.impl.XMLErrorReporter;
   import org.apache.xerces.impl.v2.XSMessageFormatter;
  +import org.apache.xerces.impl.validation.ValidationContext;
  +
   /**
    * Validator for <gYearMonth> datatype (W3C Schema Datatypes)
    * 
    * @author Elena Litani
  - * @version $Id: YearMonthDatatypeValidator.java,v 1.2 2001/10/11 15:13:33 elena Exp $
  + * @version $Id: YearMonthDatatypeValidator.java,v 1.3 2001/10/16 17:21:39 elena Exp $
    */
   
   public class YearMonthDatatypeValidator extends DateTimeValidator {
  
  
  
  1.2       +0 -1      xml-xerces/java/src/org/apache/xerces/impl/validation/ValidationState.java
  
  Index: ValidationState.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/ValidationState.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ValidationState.java	2001/10/16 15:11:38	1.1
  +++ ValidationState.java	2001/10/16 17:21:41	1.2
  @@ -57,7 +57,6 @@
   
   package org.apache.xerces.impl.validation;
   
  -import org.apache.xerces.impl.v2.datatypes.ValidationContext;
   import org.apache.xerces.util.NamespaceSupport;
   import java.util.Hashtable;
   
  
  
  
  1.1                  xml-xerces/java/src/org/apache/xerces/impl/validation/ValidationContext.java
  
  Index: ValidationContext.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xerces" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation and was
   * originally based on software copyright (c) 1999, International
   * Business Machines, Inc., http://www.apache.org.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
   
  package org.apache.xerces.impl.validation;
  
  /**
   * ValidationContext has all the information required for the 
   * validation of: id, idref, entity, notation, qname
   * 
   * @author Sandy Gao, IBM
   */
  public interface ValidationContext {
      
      // entity
      public boolean isEntityDeclared (String name);
      public boolean isEntityUnparsed (String name);
      
      // id
      public boolean isIdDeclared (String name);
      public void    addId(String name);
      
      // idref
      public void addIdRef(String name);
      
      
      // REVISIT: notation
      
      // qname
      public String resolvePrefix(String prefix);
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org