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 2018/04/25 15:39:36 UTC
[maven-pdf-plugin] 02/03: formatting cleanup
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-pdf-plugin.git
commit 13080de0b094c8dd5bc75436904cbf9ff011e6e3
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Apr 25 15:17:37 2018 +0200
formatting cleanup
---
.../java/org/apache/maven/plugins/pdf/DateBean.java | 3 ---
.../maven/plugins/pdf/DocumentDescriptorReader.java | 1 -
.../maven/plugins/pdf/DocumentModelBuilder.java | 1 -
.../java/org/apache/maven/plugins/pdf/PdfMojo.java | 21 ++++++++++-----------
.../plugins/pdf/DocumentDescriptorReaderTest.java | 2 --
.../maven/plugins/pdf/DocumentModelBuilderTest.java | 1 -
.../org/apache/maven/plugins/pdf/PdfMojoTest.java | 1 -
.../plugins/pdf/stubs/DefaultMavenProjectStub.java | 1 -
.../pdf/stubs/FilteringMavenProjectStub.java | 1 -
.../plugins/pdf/stubs/ITextMavenProjectStub.java | 1 -
.../pdf/stubs/ModelBuilderMavenProjectStub.java | 1 -
11 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/pdf/DateBean.java b/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
index b0b7db2..15b6d5d 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/DateBean.java
@@ -25,7 +25,6 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-
/**
* Simple bean to allow date interpolation in the document descriptor, i.e.
* <pre>
@@ -33,7 +32,6 @@ import java.util.TimeZone;
* ${date} = 2009-05-17
* </pre>
* @author ltheussl
- * @version $Id$
*/
public class DateBean
{
@@ -94,7 +92,6 @@ public class DateBean
this.date = date;
}
-
/**
* @return the year in format "yyyy".
*/
diff --git a/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java b/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
index bb778ed..e8c56c8 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/DocumentDescriptorReader.java
@@ -48,7 +48,6 @@ import java.util.Locale;
* Read and filter a DocumentModel from a document descriptor file.
*
* @author ltheussl
- * @version $Id$
*/
public class DocumentDescriptorReader
{
diff --git a/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java b/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
index 2ef7fbc..d910fee 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
@@ -43,7 +43,6 @@ import org.apache.commons.io.input.XmlStreamReader;
* Construct a DocumentModel from a MavenProject and related information.
*
* @author ltheussl
- * @version $Id$
*/
public class DocumentModelBuilder
{
diff --git a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
index ac41cc1..28ec6de 100644
--- a/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
+++ b/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
@@ -103,7 +103,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
* Generates a PDF document for a project documentation usually published as web site (with maven-site-plugin).
*
* @author ltheussl
- * @version $Id$
*/
@Mojo( name = "pdf", threadSafe = true )
public class PdfMojo
@@ -301,7 +300,7 @@ public class PdfMojo
*/
@Parameter( property = "validate", defaultValue = "false" )
private boolean validate;
-
+
/**
* Reports (Maven 2).
*
@@ -309,7 +308,7 @@ public class PdfMojo
*/
@Parameter( defaultValue = "${reports}", required = true, readonly = true )
private MavenReport[] reports;
-
+
/**
* Reports (Maven 3).
*
@@ -363,7 +362,7 @@ public class PdfMojo
* @since 1.1
*/
private Map<Locale, List<MavenReport>> generatedMavenReports;
-
+
/**
* @since 1.3
*/
@@ -399,7 +398,7 @@ public class PdfMojo
throw new MojoExecutionException( "Error copying generated PDF: " + e.getMessage(), e );
}
}
-
+
/** {@inheritDoc} */
public void contextualize( Context context )
throws ContextException
@@ -519,7 +518,7 @@ public class PdfMojo
{
context.put( (String) entry.getKey(), entry.getValue() );
}
-
+
final DocumentModel model = aggregate ? getDocumentModel( locale ) : null;
try
@@ -1062,11 +1061,11 @@ public class PdfMojo
FileUtils.getFileNames( new File( siteDirectory, locale.getLanguage() ), "*/"
+ report.getOutputName() + ".*", excludes, false );
}
-
+
if ( files.size() != 0 )
{
String displayLanguage = locale.getDisplayLanguage( Locale.ENGLISH );
-
+
if ( getLog().isInfoEnabled() )
{
getLog().info(
@@ -1074,7 +1073,7 @@ public class PdfMojo
+ report.getOutputName() + "\" already exists for the " + displayLanguage
+ " version." );
}
-
+
return;
}
}
@@ -1138,9 +1137,9 @@ public class PdfMojo
{
Thread.currentThread().setContextClassLoader( reportExec.getClassLoader() );
}
-
+
MavenReport report = reportExec.getMavenReport();
-
+
/*if ( report instanceof MavenMultiPageReport )
{
// extended multi-page API
diff --git a/src/test/java/org/apache/maven/plugins/pdf/DocumentDescriptorReaderTest.java b/src/test/java/org/apache/maven/plugins/pdf/DocumentDescriptorReaderTest.java
index 9d6efbf..d402633 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/DocumentDescriptorReaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/DocumentDescriptorReaderTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.pdf;
* under the License.
*/
-
import java.io.File;
import org.apache.maven.doxia.document.DocumentModel;
@@ -30,7 +29,6 @@ import org.codehaus.plexus.PlexusTestCase;
/**
*
* @author ltheussl
- * @version $Id$
*/
public class DocumentDescriptorReaderTest
extends PlexusTestCase
diff --git a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
index 2d683dc..e2829e9 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
*
* @author ltheussl
- * @version $Id$
*/
public class DocumentModelBuilderTest
extends PlexusTestCase
diff --git a/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java b/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
index 310c033..28ff7ec 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/PdfMojoTest.java
@@ -30,7 +30,6 @@ import java.io.Reader;
/**
* @author ltheussl
- * @version $Id$
*/
public class PdfMojoTest
extends AbstractMojoTestCase
diff --git a/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java
index 8cae728..48f3e70 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/stubs/DefaultMavenProjectStub.java
@@ -35,7 +35,6 @@ import org.codehaus.plexus.util.ReaderFactory;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
*/
public class DefaultMavenProjectStub
extends MavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java
index 89e6321..68c2b3b 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/stubs/FilteringMavenProjectStub.java
@@ -36,7 +36,6 @@ import org.codehaus.plexus.util.ReaderFactory;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
*/
public class FilteringMavenProjectStub
extends MavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java
index 23e169a..7d81d5a 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/stubs/ITextMavenProjectStub.java
@@ -35,7 +35,6 @@ import org.codehaus.plexus.util.ReaderFactory;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
*/
public class ITextMavenProjectStub
extends MavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
index 34cb5ba..2369900 100644
--- a/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
@@ -32,7 +32,6 @@ import org.apache.commons.io.input.XmlStreamReader;
/**
* @author ltheussl
- * @version $Id$
*/
public class ModelBuilderMavenProjectStub
extends MavenProjectStub
--
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.