cvs commit: xml-xalan/src/org/apache/xalan/xslt ElemElement.java

[mmidy]

mmidy       00/02/18 08:43:05

  Modified:    src/org/apache/xalan/xslt ElemElement.java
  Log:
  Don't redefine the namespace
  
  Revision  Changes    Path
  1.8       +15 -10    xml-xalan/src/org/apache/xalan/xslt/ElemElement.java
  
  Index: ElemElement.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemElement.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ElemElement.java  2000/02/16 20:35:16     1.7
  +++ ElemElement.java  2000/02/18 16:43:05     1.8
  @@ -66,6 +66,7 @@
   {
     public AVT m_name_avt = null;
     public AVT m_namespace_avt = null;
  +  private String m_prefix;
   
     public int getXSLToken()
     {
  @@ -146,17 +147,21 @@
                                                           new StringBuffer());
           if(null != elemNameSpace && elemNameSpace.length()>0)
           {
  -          String prefix = 
processor.getResultPrefixForNamespace(elemNameSpace);
  -          if(null == prefix)
  -          {
  -            prefix = "ns"+String.valueOf(processor.m_uniqueNSValue);
  -            processor.m_uniqueNSValue++;
  -            String nsDecl = "xmlns:"+prefix;
  -            processor.addResultAttribute( 
  +          if (m_prefix == null)
  +          {  
  +            String prefix = 
processor.getResultPrefixForNamespace(elemNameSpace);
  +            if(null == prefix)
  +            {
  +              prefix = "ns"+String.valueOf(processor.m_uniqueNSValue);
  +              processor.m_uniqueNSValue++;
  +              String nsDecl = "xmlns:"+prefix;
  +              processor.addResultAttribute( 
                                  processor.m_pendingAttributes, 
  -                               nsDecl, elemNameSpace);
  -          }
  -          elemName = (prefix + ":"+elemName);
  +                               nsDecl, elemNameSpace);            
  +            }
  +            m_prefix = prefix;
  +          }  
  +          elemName = (m_prefix + ":"+elemName);
           }
         }