cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation FilterTransformer.java

[joerg]

joerg       2004/03/08 16:57:35

  Modified:    .        status.xml
               src/java/org/apache/cocoon/transformation
                        FilterTransformer.java
  Log:
  fixed bug 27301: Fix namespace handling in FilterTransformer.
  
  Revision  Changes    Path
  1.266     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.265
  retrieving revision 1.266
  diff -u -r1.265 -r1.266
  --- status.xml        8 Mar 2004 23:32:50 -0000       1.265
  +++ status.xml        9 Mar 2004 00:57:35 -0000       1.266
  @@ -211,6 +211,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="JH" type="fix" fixes-bug="27301">
  +     Fix namespace handling in FilterTransformer.
  +   </action>
      <action dev="JH" type="add" fixes-bug="27020" due-to="Peter Horsfield" 
due-to-email="[EMAIL PROTECTED]">
        Added grayscaling and color transformation to the ImageReader.
      </action>
  
  
  
  1.5       +7 -7      
cocoon-2.1/src/java/org/apache/cocoon/transformation/FilterTransformer.java
  
  Index: FilterTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/FilterTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FilterTransformer.java    5 Mar 2004 13:02:59 -0000       1.4
  +++ FilterTransformer.java    9 Mar 2004 00:57:35 -0000       1.5
  @@ -127,17 +127,17 @@
               if (this.currentBlocknr != 
(int)Math.ceil((float)this.counter/this.count)) {
                   this.currentBlocknr = 
(int)Math.ceil((float)this.counter/this.count);
                   AttributesImpl attr = new AttributesImpl();
  -                attr.addAttribute(uri, BLOCKID, 
BLOCKID,"CDATA",String.valueOf(this.currentBlocknr));
  +                attr.addAttribute("", BLOCKID, BLOCKID, "CDATA", 
String.valueOf(this.currentBlocknr));
                   if (this.counter < this.count)  {
  -                    super.contentHandler.startElement(uri, BLOCK, BLOCK, 
attr);
  +                    super.contentHandler.startElement("", BLOCK, BLOCK, 
attr);
                   } else  {
                       // fix Bugzilla Bug 13904, check if counter == 1
  -                    // in this case there is no startElement( uri, BLOCK, 
BLOCK)
  +                    // in this case there is no startElement("", BLOCK, 
BLOCK)
                       // written, yet
                       if (this.counter > 1) {
  -                        super.contentHandler.endElement(uri, BLOCK, BLOCK);
  +                        super.contentHandler.endElement("", BLOCK, BLOCK);
                       }
  -                    super.contentHandler.startElement(uri, BLOCK, BLOCK, 
attr);
  +                    super.contentHandler.startElement("", BLOCK, BLOCK, 
attr);
                   }
               }
           } else if (!this.foundIt)  {
  @@ -155,7 +155,7 @@
               // <parent>
               //   <element>
               //     <parent>
  -            super.contentHandler.endElement(uri, BLOCK, BLOCK);
  +            super.contentHandler.endElement("", BLOCK, BLOCK);
               super.contentHandler.endElement(uri, name, raw);
               this.foundIt = false;
               this.skip = false;