svn commit: r784533 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java

[vsiveton]

Author: vsiveton
Date: Sun Jun 14 10:02:54 2009
New Revision: 784533

URL: http://svn.apache.org/viewvc?rev=784533&view=rev
Log:
o unify log

Modified:
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java?rev=784533&r1=784532&r2=784533&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSink.java
 Sun Jun 14 10:02:54 2009
@@ -883,7 +883,7 @@
      */
     public void unknown( String name, Object[] requiredParams, 
SinkEventAttributes attributes )
     {
-        getLog().warn( "Unknown Sink event in AptSink: " + name + ", 
ignoring!" );
+        getLog().warn( "[Apt Sink] Unknown Sink event: '" + name + "', 
ignoring!" );
     }
 
     /**

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=784533&r1=784532&r2=784533&view=diff
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
 Sun Jun 14 10:02:54 2009
@@ -31,6 +31,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Latex Sink implementation.
@@ -603,15 +604,13 @@
      */
     public void figureGraphics( String name )
     {
-        String src = name;
-
-        if ( !src.endsWith( ".eps" ) )
+        if ( !name.toLowerCase( Locale.ENGLISH ).endsWith( ".eps" ) )
         {
-            getLog().warn( "[latex-sink] Found non-eps figure graphics!" );
+            getLog().warn( "[Latex Sink] Found non-eps figure graphics!" );
         }
 
         markup( "\\begin{center}" + EOL );
-        markup( "\\includegraphics{" + src + "}" + EOL );
+        markup( "\\includegraphics{" + name + "}" + EOL );
         markup( "\\end{center}" + EOL );
     }
 
@@ -1021,7 +1020,7 @@
      */
     public void unknown( String name, Object[] requiredParams, 
SinkEventAttributes attributes )
     {
-        getLog().warn( "Unknown Sink event in LatexSink: " + name + ", 
ignoring!" );
+        getLog().warn( "[Latex Sink] Unknown Sink event: '" + name + "', 
ignoring!" );
     }
 
     // -----------------------------------------------------------------------
@@ -1178,11 +1177,9 @@
      */
     protected String defaultSinkCommands()
     {
-        String commands = "";
-
         try
         {
-            commands = IOUtil.toString( getDefaultSinkCommands() );
+            return IOUtil.toString( getDefaultSinkCommands() );
         }
         catch ( IOException ioe )
         {
@@ -1192,8 +1189,6 @@
 
             return "";
         }
-
-        return commands;
     }
 
     /**