avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon/src/java/org/apache/avalon/framework/configuration NamespacedSAXConfigurationHandler.java
Date Fri, 30 Aug 2002 17:33:10 GMT
bloritsch    2002/08/30 10:33:10

  Modified:    src/java/org/apache/avalon/framework/configuration
                        NamespacedSAXConfigurationHandler.java
  Log:
  apply fix for NamespacedSAXConfigurationHandler to act exactly like the SAXConfigurationHandler,
with the exception of supporting namespaces
  
  Revision  Changes    Path
  1.10      +13 -9     jakarta-avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java
  
  Index: NamespacedSAXConfigurationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NamespacedSAXConfigurationHandler.java	5 Aug 2002 13:23:56 -0000	1.9
  +++ NamespacedSAXConfigurationHandler.java	30 Aug 2002 17:33:10 -0000	1.10
  @@ -245,15 +245,6 @@
           m_elements.add( configuration );
           m_values.add( new StringBuffer() );
   
  -        if( preserveSpace )
  -        {
  -            m_preserveSpace.set( depth );
  -        }
  -        else
  -        {
  -            m_preserveSpace.clear( depth );
  -        }
  -        
           final ArrayList prefixes = new ArrayList();
           AttributesImpl componentAttr = new AttributesImpl();
   
  @@ -265,6 +256,10 @@
                   this.startPrefixMapping( attributes.getLocalName( i ),
                                            attributes.getValue( i ) );
               }
  +            else if ( attributes.getQName( i ).equals( "xml:space" ) )
  +            {
  +                preserveSpace = attributes.getValue( i ).equals( "preserve" );
  +            }
               else
               {
                   componentAttr.addAttribute( attributes.getURI( i ),
  @@ -273,6 +268,15 @@
                                               attributes.getType( i ),
                                               attributes.getValue( i ) );
               }
  +        }
  +
  +        if( preserveSpace )
  +        {
  +            m_preserveSpace.set( depth );
  +        }
  +        else
  +        {
  +            m_preserveSpace.clear( depth );
           }
   
           m_prefixes.add( prefixes );
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message