You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/02/12 16:29:04 UTC
svn commit: r1070089 -
/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Author: hboutemy
Date: Sat Feb 12 15:29:03 2011
New Revision: 1070089
URL: http://svn.apache.org/viewvc?rev=1070089&view=rev
Log:
code simplification
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=1070089&r1=1070088&r2=1070089&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 Sat Feb 12 15:29:03 2011
@@ -464,49 +464,39 @@ public class PdfMojo
private void copyGeneratedPdf()
throws MojoExecutionException, IOException
{
- if ( !outputDirectory.getCanonicalPath().equals( workingDirectory.getCanonicalPath() ) )
+ if ( outputDirectory.getCanonicalPath().equals( workingDirectory.getCanonicalPath() ) )
{
- String outputName = getDocumentModel( getDefaultLocale() ).getOutputName().trim();
- if ( !outputName.endsWith( ".pdf" ) )
- {
- outputName = outputName.concat( ".pdf" );
- }
+ return;
+ }
- for ( final Iterator iterator = getAvailableLocales().iterator(); iterator.hasNext(); )
- {
- final Locale locale = (Locale) iterator.next();
+ String outputName = getDocumentModel( getDefaultLocale() ).getOutputName().trim();
+ if ( !outputName.endsWith( ".pdf" ) )
+ {
+ outputName = outputName.concat( ".pdf" );
+ }
- File generatedPdfSource;
- if ( !locale.getLanguage().equals( getDefaultLocale().getLanguage() ) )
- {
- generatedPdfSource =
- new File( workingDirectory, locale.getLanguage() + File.separator + outputName );
- }
- else
- {
- generatedPdfSource = new File( workingDirectory, outputName );
- }
+ for ( final Iterator iterator = getAvailableLocales().iterator(); iterator.hasNext(); )
+ {
+ final Locale locale = (Locale) iterator.next();
- if ( !generatedPdfSource.exists() )
- {
- getLog().warn( "Unable to find the generated pdf: " + generatedPdfSource.getAbsolutePath() );
- continue;
- }
+ String filename = outputName;
+ if ( !locale.getLanguage().equals( getDefaultLocale().getLanguage() ) )
+ {
+ filename = locale.getLanguage() + File.separator + outputName;
+ }
- File generatedPdfDest;
- if ( !locale.getLanguage().equals( getDefaultLocale().getLanguage() ) )
- {
- generatedPdfDest =
- new File( outputDirectory, locale.getLanguage() + File.separator + outputName );
- }
- else
- {
- generatedPdfDest = new File( outputDirectory, outputName );
- }
+ File generatedPdfSource = new File( workingDirectory, filename );
- FileUtils.copyFile( generatedPdfSource, generatedPdfDest );
- generatedPdfSource.delete();
+ if ( !generatedPdfSource.exists() )
+ {
+ getLog().warn( "Unable to find the generated pdf: " + generatedPdfSource.getAbsolutePath() );
+ continue;
}
+
+ File generatedPdfDest = new File( outputDirectory, filename );
+
+ FileUtils.copyFile( generatedPdfSource, generatedPdfDest );
+ generatedPdfSource.delete();
}
}