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

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

lehors      01/05/04 12:38:09

  Modified:    java/src/org/apache/xerces/parsers Tag: xerces_j_2
                        AbstractSAXParser.java
  Log:
  fixed startElement to remove namespace declaration attributes for SAX2
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.11  +24 -2     xml-xerces/java/src/org/apache/xerces/parsers/Attic/AbstractSAXParser.java
  
  Index: AbstractSAXParser.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/AbstractSAXParser.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- AbstractSAXParser.java	2001/04/10 04:49:31	1.1.2.10
  +++ AbstractSAXParser.java	2001/05/04 19:38:03	1.1.2.11
  @@ -90,12 +90,12 @@
    * @author Arnaud Le Hors, IBM
    * @author Andy Clark, IBM
    *
  - * @version $Id: AbstractSAXParser.java,v 1.1.2.10 2001/04/10 04:49:31 andyc Exp $ 
  + * @version $Id: AbstractSAXParser.java,v 1.1.2.11 2001/05/04 19:38:03 lehors Exp $ 
    */
   public abstract class AbstractSAXParser
       extends AbstractXMLDocumentParser
       implements Parser, XMLReader // SAX1, SAX2
  -    {
  +{
   
       //
       // Constants
  @@ -116,6 +116,10 @@
       // Data
       //
   
  +    // features
  +
  +    boolean fNamespacePrefixes = false;
  +
       // parser handlers
   
       /** Content handler. */
  @@ -133,10 +137,13 @@
       /** Lexical handler. */
       protected LexicalHandler fLexicalHandler;
   
  +    protected QName fQName = new QName();
  +
       // symbols
          
       /** Symbol: empty string (""). */
       private String fEmptySymbol;
  +    private String fXmlnsSymbol;
   
       // state
   
  @@ -283,6 +290,19 @@
   
           // SAX2
           if (fContentHandler != null) {
  +
  +            if (!fNamespacePrefixes) {
  +                // remove namespace declaration attributes
  +                int len = attributes.getLength();
  +                for (int i = len - 1; i >= 0; i--) {
  +                    attributes.getName(i, fQName);
  +                    if (fQName.rawname == fXmlnsSymbol ||
  +                        fQName.prefix == fXmlnsSymbol) {
  +                        attributes.removeAttributeAt(i);
  +                    }
  +                }
  +            }
  +
               String uri = element.uri != null ? element.uri : fEmptySymbol;
               fContentHandler.startElement(uri, element.localpart,
                                            element.rawname, attributes);
  @@ -845,6 +865,7 @@
               //
               if (feature.equals(Constants.NAMESPACE_PREFIXES_FEATURE)) {
                   fConfiguration.setFeature(featureId, state);
  +                fNamespacePrefixes = state;
                   return;
               }
               // http://xml.org/sax/features/string-interning
  @@ -1245,6 +1266,7 @@
           // save needed symbols
           SymbolTable symbolTable = (SymbolTable)fConfiguration.getProperty(SYMBOL_TABLE);
           fEmptySymbol = symbolTable.addSymbol("");
  +        fXmlnsSymbol = symbolTable.addSymbol("xmlns");
   
       } // reset()
   
  
  
  

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