You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by lm...@apache.org on 2002/01/09 17:06:42 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/parsers AbstractSAXParser.java

lmartin     02/01/09 08:06:42

  Modified:    java/src/org/apache/xerces/parsers AbstractSAXParser.java
  Log:
  in attributeDecl call, the type should be a parenthesized list of tokens for enumerated types.  Fix for bug 5317
  
  Revision  Changes    Path
  1.12      +12 -4     xml-xerces/java/src/org/apache/xerces/parsers/AbstractSAXParser.java
  
  Index: AbstractSAXParser.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/AbstractSAXParser.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractSAXParser.java	20 Dec 2001 13:44:51 -0000	1.11
  +++ AbstractSAXParser.java	9 Jan 2002 16:06:42 -0000	1.12
  @@ -110,7 +110,7 @@
    * @author Arnaud Le Hors, IBM
    * @author Andy Clark, IBM
    *
  - * @version $Id: AbstractSAXParser.java,v 1.11 2001/12/20 13:44:51 rahuls Exp $
  + * @version $Id: AbstractSAXParser.java,v 1.12 2002/01/09 16:06:42 lmartin Exp $
    */
   public abstract class AbstractSAXParser
       extends AbstractXMLDocumentParser
  @@ -409,6 +409,7 @@
                               attributes.setName(i, fQName);
                           }
                       }
  +                  
                   }
                   
                   String uri = element.uri != null ? element.uri : fEmptySymbol;
  @@ -841,10 +842,17 @@
           try {
               // SAX2 extension
               if (fDeclHandler != null) {
  -                if (type.equals("NOTATION")) {
  +                if (type.equals("NOTATION") || 
  +                    type.equals("ENUMERATION")) {
  +
                       StringBuffer str = new StringBuffer();
  -                    str.append(type);
  -                    str.append(" (");
  +                    if (type.equals("NOTATION")) {
  +                      str.append(type);
  +                      str.append(" (");
  +                    }
  +                    else {
  +                      str.append("(");
  +                    }
                       for (int i = 0; i < enumeration.length; i++) {
                           str.append(enumeration[i]);
                           if (i < enumeration.length - 1) {
  
  
  

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