svn commit: r809519 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

[vsiveton]

Author: vsiveton
Date: Mon Aug 31 09:32:29 2009
New Revision: 809519

URL: http://svn.apache.org/viewvc?rev=809519&view=rev
Log:
DOXIA-364:  Guarantee the state of sinks and parsers impl

o added init() method from r807164

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=809519&r1=809518&r2=809519&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
 Mon Aug 31 09:32:29 2009
@@ -108,6 +108,8 @@
     /** {...@inheritdoc} */
     public void head( SinkEventAttributes attributes )
     {
+        init();
+
         ignoreText = true;
     }
 
@@ -266,11 +268,6 @@
         String idName = name.replace( '\\', '/' );
 
         // prepend "./" and strip extension
-        while ( idName.indexOf( "//" ) != -1 )
-        {
-            idName = StringUtils.replace( idName, "//", "/" );
-        }
-
         if ( !idName.startsWith( "./" ) )
         {
             idName = "./" + idName;
@@ -281,6 +278,11 @@
             idName = idName.substring( 0, idName.lastIndexOf( "." ) );
         }
 
+        while ( idName.indexOf( "//" ) != -1 )
+        {
+            idName = StringUtils.replace( idName, "//", "/" );
+        }
+
         return idName;
     }