svn commit: r694094 - /maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java

[vsiveton]

Author: vsiveton
Date: Wed Sep 10 19:26:47 2008
New Revision: 694094

URL: http://svn.apache.org/viewvc?rev=694094&view=rev
Log:
o add logging for parser and sink
o fixed reader depending parser type

Modified:
    
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java

Modified: 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java?rev=694094&r1=694093&r2=694094&view=diff
==============================================================================
--- 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 (original)
+++ 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 Wed Sep 10 19:26:47 2008
@@ -192,6 +192,7 @@
             try
             {
                 parser = getParser( plexus, input.getFormat() );
+                parser.enableLogging( log );
             }
             catch ( ComponentLookupException e )
             {
@@ -263,6 +264,7 @@
             try
             {
                 parser = getParser( plexus, input.getFormat() );
+                parser.enableLogging( log );
             }
             catch ( ComponentLookupException e )
             {
@@ -275,6 +277,7 @@
             }
 
             Sink sink = getSink( output.getFormat(), output.getWriter() );
+            sink.enableLogging( log );
 
             if ( getLog().isDebugEnabled() )
             {
@@ -466,7 +469,14 @@
 
             if ( inputEncoding != null )
             {
-                reader = ReaderFactory.newReader( inputFile, inputEncoding );
+                if ( parser.getType() == Parser.XML_TYPE )
+                {
+                    reader = ReaderFactory.newXmlReader( inputFile );
+                }
+                else
+                {
+                    reader = ReaderFactory.newReader( inputFile, inputEncoding 
);
+                }
             }
             else
             {
@@ -495,14 +505,7 @@
                 outputEncoding = output.getEncoding();
             }
 
-            if ( parser.getType() == Parser.XML_TYPE )
-            {
-                writer = WriterFactory.newXmlWriter( outputFile );
-            }
-            else
-            {
-                writer = WriterFactory.newWriter( outputFile, outputEncoding );
-            }
+            writer = WriterFactory.newWriter( outputFile, outputEncoding );
         }
         catch ( IOException e )
         {
@@ -510,6 +513,7 @@
         }
 
         Sink sink = getSink( output.getFormat(), writer );
+        sink.enableLogging( log );
 
         if ( getLog().isDebugEnabled() )
         {