Author: vsiveton
Date: Mon May 28 17:11:44 2007
New Revision: 542363

URL: http://svn.apache.org/viewvc?view=rev&rev=542363
Log:
DOXIA-113:  Can't build doxia with jdk1.4 in rev 542303
Submitted by: Olivier Lamy
Reviewed by: Vincent Siveton

o patch applied

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java?view=diff&rev=542363&r1=542362&r2=542363
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
 Mon May 28 17:11:44 2007
@@ -1,4 +1,4 @@
-package org.codehaus.doxia.module.xdoc;
+package org.apache.maven.doxia.module.xdoc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import org.apache.maven.doxia.util.HtmlTools;                                  
                                                
-import org.apache.maven.doxia.sink.SinkAdapter;                                
                                                
+import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.sink.SinkAdapter;
 import org.apache.maven.doxia.sink.StructureSink;
+import org.apache.maven.doxia.util.HtmlTools;
+import org.apache.maven.doxia.util.StringUtil;
 import org.codehaus.plexus.util.xml.XMLWriter;
-import org.apache.maven.doxia.parser.Parser;                                   
                                                
 
 /**
  * A doxia Sink which produces an xdoc document.
@@ -54,7 +55,6 @@
             throw new IllegalArgumentException("argument can't be null");
         }
         this.writer = writer;
-        
     }
 
     protected void resetState()
@@ -81,8 +81,8 @@
     public void head_()
     {
         headFlag = false;
-        
-        writer.endElement(); // properties    
+
+        writer.endElement(); // properties
     }
 
     public void title_()
@@ -402,7 +402,6 @@
             }
         }
 
-        
         writer.startElement("t" + ( headerRow ? 'h' : 'd' ));
         if ( justif != null )
             writer.addAttribute("align", justif);
@@ -535,7 +534,7 @@
         {
             buffer.append( text );
         }
-        else if ( sectionTitleFlag ) 
+        else if ( sectionTitleFlag )
         {
             buffer.append( text );
         }
@@ -564,7 +563,7 @@
 
     protected void verbatimContent( String text )
     {
-        writer.writeText( text.replace(" ", " "));
+        writer.writeText( StringUtil.replaceAll( text, " ", " " ) );
     }
 
     public static String escapeHTML( String text )


Reply via email to