You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/01/25 07:53:23 UTC
svn commit: r1063155 -
/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Author: ltheussl
Date: Tue Jan 25 06:53:23 2011
New Revision: 1063155
URL: http://svn.apache.org/viewvc?rev=1063155&view=rev
Log:
simplify logger calls
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1063155&r1=1063154&r2=1063155&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java Tue Jan 25 06:53:23 2011
@@ -677,8 +677,7 @@ public class PdfMojo
if ( siteFiles.contains( generatedSiteFile ) )
{
- getLog().warn(
- "Generated-site already contains a file in site: " + generatedSiteFile
+ getLog().warn( "Generated-site already contains a file in site: " + generatedSiteFile
+ ". Ignoring copying it!" );
continue;
}
@@ -1193,10 +1192,7 @@ public class PdfMojo
String localReportName = report.getName( locale );
if ( !report.canGenerateReport() )
{
- if ( getLog().isInfoEnabled() )
- {
- getLog().info( "Skipped \"" + localReportName + "\" report." );
- }
+ getLog().info( "Skipped \"" + localReportName + "\" report." );
getLog().debug( "canGenerateReport() was false." );
return;
@@ -1204,10 +1200,7 @@ public class PdfMojo
if ( report.isExternalReport() )
{
- if ( getLog().isInfoEnabled() )
- {
- getLog().info( "Skipped external \"" + localReportName + "\" report." );
- }
+ getLog().info( "Skipped external \"" + localReportName + "\" report." );
getLog().debug( "isExternalReport() was false." );
return;
@@ -1441,14 +1434,8 @@ public class PdfMojo
}
catch ( IOException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "IOException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "IOException: " + e.getMessage() );
- }
+ getLog().error( "IOException: " + e.getMessage() );
+ getLog().debug( e );
}
// append to Toc
@@ -1479,26 +1466,14 @@ public class PdfMojo
}
catch ( ParseException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "ParseException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "ParseException: " + e.getMessage() );
- }
+ getLog().error( "ParseException: " + e.getMessage() );
+ getLog().debug( e );
return null;
}
catch ( ParserNotFoundException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "ParserNotFoundException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "ParserNotFoundException: " + e.getMessage() );
- }
+ getLog().error( "ParserNotFoundException: " + e.getMessage() );
+ getLog().debug( e );
return null;
}
finally
@@ -1598,40 +1573,22 @@ public class PdfMojo
sb.append( EOL ).append( "Ignoring the \"" ).append( localReportName ).append( "\" report in the PDF.").append( EOL );
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( sb.toString(), e );
- }
- else
- {
- getLog().error( sb.toString() );
- }
+ getLog().error( sb.toString() );
+ getLog().debug( e );
return false;
}
catch ( ParserNotFoundException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "ParserNotFoundException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "ParserNotFoundException: " + e.getMessage() );
- }
+ getLog().error( "ParserNotFoundException: " + e.getMessage() );
+ getLog().debug( e );
return false;
}
catch ( IOException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "IOException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "IOException: " + e.getMessage() );
- }
+ getLog().error( "IOException: " + e.getMessage() );
+ getLog().debug( e );
return false;
}
@@ -1660,14 +1617,8 @@ public class PdfMojo
}
catch ( ProjectBuildingException e )
{
- if ( getLog().isDebugEnabled() )
- {
- getLog().error( "ProjectBuildingException: " + e.getMessage(), e );
- }
- else
- {
- getLog().error( "ProjectBuildingException: " + e.getMessage() );
- }
+ getLog().error( "ProjectBuildingException: " + e.getMessage() );
+ getLog().debug( e );
}
return null;