You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by er...@locus.apache.org on 2000/12/05 19:19:01 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/impl/validation/grammars DTDGrammar.java

ericye      00/12/05 10:19:00

  Modified:    java/src/org/apache/xerces/impl/validation/grammars Tag:
                        xerces_j_2 DTDGrammar.java
  Log:
  adding checks for attributes of Notation and Enumeration types
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.33  +2 -12     xml-xerces/java/src/org/apache/xerces/impl/validation/grammars/Attic/DTDGrammar.java
  
  Index: DTDGrammar.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/grammars/Attic/DTDGrammar.java,v
  retrieving revision 1.1.2.32
  retrieving revision 1.1.2.33
  diff -u -r1.1.2.32 -r1.1.2.33
  --- DTDGrammar.java	2000/11/09 22:13:28	1.1.2.32
  +++ DTDGrammar.java	2000/12/05 18:18:58	1.1.2.33
  @@ -82,7 +82,7 @@
    * @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
    * @author Jeffrey Rodriguez, IBM
    *
  - * @version $Id: DTDGrammar.java,v 1.1.2.32 2000/11/09 22:13:28 ericye Exp $
  + * @version $Id: DTDGrammar.java,v 1.1.2.33 2000/12/05 18:18:58 ericye Exp $
    */
   public class DTDGrammar
   extends Grammar
  @@ -513,21 +513,11 @@
             fSimpleType.type = XMLSimpleType.TYPE_NOTATION;
             Hashtable facets = new Hashtable();
             facets.put(SchemaSymbols.ELT_ENUMERATION, fSimpleType.enumeration);
  -          DatatypeValidator dv = 
  -              DatatypeValidatorFactoryImpl.getDatatypeRegistry().createDatatypeValidator(attributeName+"_NOTATION", 
  -                                                                                         fSimpleType.datatypeValidator,
  -                                                                                         facets, false);
  -          fSimpleType.datatypeValidator = dv;
         }
  -      else if (type.startsWith("(") ) {
  +      else if (type.startsWith("ENUMERATION") ) {
             fSimpleType.type = XMLSimpleType.TYPE_ENUMERATION;
             Hashtable facets = new Hashtable();
             facets.put(SchemaSymbols.ELT_ENUMERATION, fSimpleType.enumeration);
  -          DatatypeValidator dv = 
  -              DatatypeValidatorFactoryImpl.getDatatypeRegistry().createDatatypeValidator(attributeName+"_CDATA", 
  -                                                                                         DatatypeValidatorFactoryImpl.getDatatypeRegistry().getDatatypeValidator("string"),
  -                                                                                         facets, false);
  -          fSimpleType.datatypeValidator = dv;
         }
   
         fQName.clear();