You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 20:25:11 UTC
svn commit: r1517906 [20/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java (original)
+++ maven/plugins/trunk/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java Tue Aug 27 18:25:03 2013
@@ -55,13 +55,13 @@ import org.codehaus.plexus.util.cli.Comm
/**
+ *
* @author ltheussl
* @since 1.1
*/
public class SiteInvoker
{
private final ArtifactRepository localRepository;
-
private final Log log;
public SiteInvoker( ArtifactRepository localRepository, Log log )
@@ -80,7 +80,7 @@ public class SiteInvoker
* <b>Note 2</be>: we can't use <code>siteOutputDirectory</code> param from site plugin because some plugins
* <code>${project.reporting.outputDirectory}</code> in their conf.
*
- * @param project the MavenProject to invoke the site on. Not null.
+ * @param project the MavenProject to invoke the site on. Not null.
* @param tmpReportingOutputDirectory not null
* @throws IOException if any
*/
@@ -91,7 +91,7 @@ public class SiteInvoker
if ( StringUtils.isEmpty( mavenHome ) )
{
getLog().error( "Could NOT invoke Maven because no Maven Home is defined. "
- + "You need to set the M2_HOME system env variable or a 'maven.home' Java system property." );
+ + "You need to set the M2_HOME system env variable or a 'maven.home' Java system property." );
return;
}
@@ -156,9 +156,8 @@ public class SiteInvoker
{
List profileIds = new ArrayList();
- for ( Object o : clone.getActiveProfiles() )
- {
- profileIds.add( ( (Profile) o ).getId() );
+ for (Object o : clone.getActiveProfiles()) {
+ profileIds.add(((Profile) o).getId());
}
return profileIds;
@@ -166,13 +165,13 @@ public class SiteInvoker
/**
* @param projectFile not null, should be in the ${project.basedir}
- * @param invokerLog not null
- * @param mavenHome not null
- * @param goals the list of goals
- * @param properties the properties for the invoker
+ * @param invokerLog not null
+ * @param mavenHome not null
+ * @param goals the list of goals
+ * @param properties the properties for the invoker
*/
- private void invoke( File projectFile, File invokerLog, String mavenHome, List goals, List activeProfiles,
- Properties properties )
+ private void invoke( File projectFile, File invokerLog, String mavenHome,
+ List goals, List activeProfiles, Properties properties )
{
Invoker invoker = new DefaultInvoker();
invoker.setMavenHome( new File( mavenHome ) );
@@ -231,7 +230,8 @@ public class SiteInvoker
IOUtil.close( reader );
}
- if ( invokerLogContent != null && invokerLogContent.contains( "Error occurred during initialization of VM" ) )
+ if ( invokerLogContent != null
+ && invokerLogContent.contains("Error occurred during initialization of VM"))
{
getLog().info( "Error occurred during initialization of VM, try to use an empty MAVEN_OPTS." );
@@ -256,19 +256,19 @@ public class SiteInvoker
{
if ( getLog().isErrorEnabled() )
{
- getLog().error(
- "Error when invoking Maven, consult the invoker log file: " + invokerLog.getAbsolutePath() );
+ getLog().error( "Error when invoking Maven, consult the invoker log file: "
+ + invokerLog.getAbsolutePath() );
}
}
}
/**
- * @param invoker not null
- * @param request not null
+ * @param invoker not null
+ * @param request not null
* @param invokerLog not null
- * @param goals the list of goals
+ * @param goals the list of goals
* @param properties the properties for the invoker
- * @param mavenOpts could be null
+ * @param mavenOpts could be null
* @return the invocation result
* @throws MavenInvocationException if any
*/
@@ -298,8 +298,8 @@ public class SiteInvoker
{
if ( getLog().isErrorEnabled() )
{
- getLog().error(
- "FileNotFoundException: " + e.getMessage() + ". Using System.out to log the invoker." );
+ getLog().error( "FileNotFoundException: " + e.getMessage()
+ + ". Using System.out to log the invoker." );
}
ps = System.out;
}
@@ -307,8 +307,8 @@ public class SiteInvoker
{
if ( getLog().isErrorEnabled() )
{
- getLog().error(
- "UnsupportedEncodingException: " + e.getMessage() + ". Using System.out to log the invoker." );
+ getLog().error( "UnsupportedEncodingException: " + e.getMessage()
+ + ". Using System.out to log the invoker." );
}
ps = System.out;
}
@@ -350,7 +350,7 @@ public class SiteInvoker
/**
* @return the Maven home defined in the <code>maven.home</code> system property or defined
- * in <code>M2_HOME</code> system env variables or null if never setted.
+ * in <code>M2_HOME</code> system env variables or null if never setted.
* @see #invoke(Invoker, InvocationRequest, File, List, Properties, String)
*/
private String getMavenHome()
@@ -373,7 +373,7 @@ public class SiteInvoker
if ( !m2Home.exists() )
{
getLog().error( "Cannot find Maven application directory. Either specify \'maven.home\' "
- + "system property, or M2_HOME environment variable." );
+ + "system property, or M2_HOME environment variable." );
}
return mavenHome;
@@ -401,8 +401,8 @@ public class SiteInvoker
/**
* @return the <code>JAVA_HOME</code> from System.getProperty( "java.home" )
- * By default, <code>System.getProperty( "java.home" ) = JRE_HOME</code> and <code>JRE_HOME</code>
- * should be in the <code>JDK_HOME</code> or null if not setted.
+ * By default, <code>System.getProperty( "java.home" ) = JRE_HOME</code> and <code>JRE_HOME</code>
+ * should be in the <code>JDK_HOME</code> or null if not setted.
* @see #invoke(Invoker, InvocationRequest, File, List, Properties, String)
*/
private File getJavaHome()
@@ -433,7 +433,7 @@ public class SiteInvoker
if ( javaHome == null || !javaHome.exists() )
{
getLog().error( "Cannot find Java application directory. Either specify \'java.home\' "
- + "system property, or JAVA_HOME environment variable." );
+ + "system property, or JAVA_HOME environment variable." );
}
return javaHome;
Modified: maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java (original)
+++ maven/plugins/trunk/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java Tue Aug 27 18:25:03 2013
@@ -232,7 +232,6 @@ public class ApplyMojo
/**
* apply --binary option to patch command line
- *
* @since 1.2
*/
@Parameter( defaultValue = "false" )
@@ -275,8 +274,8 @@ public class ApplyMojo
{
if ( !patchDirectory.isDirectory() )
{
- throw new FileNotFoundException(
- "The base directory for patch files does not exist: " + patchDirectory );
+ throw new FileNotFoundException( "The base directory for patch files does not exist: "
+ + patchDirectory );
}
List foundPatchFiles = FileUtils.getFileNames( patchDirectory, "*", null, false );
@@ -323,37 +322,30 @@ public class ApplyMojo
throw new MojoFailureException( "unable to read patch tracking file: " + ioe.getMessage() );
}
- for ( Object patche : patches )
- {
+ for (Object patche : patches) {
String patch = (String) patche;
- if ( !alreadyAppliedPatches.contains( patch ) )
- {
- File patchFile = new File( patchSourceDir, patch );
+ if (!alreadyAppliedPatches.contains(patch)) {
+ File patchFile = new File(patchSourceDir, patch);
- getLog().debug( "Looking for patch: " + patch + " in: " + patchFile );
+ getLog().debug("Looking for patch: " + patch + " in: " + patchFile);
- if ( !patchFile.exists() )
- {
- if ( strictPatching )
- {
- throw new MojoFailureException( this, "Patch operation cannot proceed.",
- "Cannot find specified patch: \'" + patch
- + "\' in patch-source directory: \'" + patchSourceDir
- + "\'.\n\nEither fix this error, "
- + "or relax strictPatching." );
- }
- else
- {
+ if (!patchFile.exists()) {
+ if (strictPatching) {
+ throw new MojoFailureException(this, "Patch operation cannot proceed.",
+ "Cannot find specified patch: \'" + patch
+ + "\' in patch-source directory: \'" + patchSourceDir
+ + "\'.\n\nEither fix this error, "
+ + "or relax strictPatching.");
+ } else {
getLog().info(
- "Skipping patch: " + patch + " listed in the parameter \"patches\"; " + "it is missing." );
+ "Skipping patch: " + patch + " listed in the parameter \"patches\"; "
+ + "it is missing.");
}
- }
- else
- {
- foundPatchFiles.remove( patch );
+ } else {
+ foundPatchFiles.remove(patch);
- patchesApplied.put( patch, createPatchCommand( patchFile ) );
+ patchesApplied.put(patch, createPatchCommand(patchFile));
}
}
}
@@ -380,29 +372,26 @@ public class ApplyMojo
List limbo = new ArrayList( foundPatchFiles );
- for ( Object anIgnored : ignored )
- {
+ for (Object anIgnored : ignored) {
String ignoredFile = (String) anIgnored;
- limbo.remove( ignoredFile );
+ limbo.remove(ignoredFile);
}
if ( !limbo.isEmpty() )
{
StringBuilder extraFileBuffer = new StringBuilder();
- extraFileBuffer.append( "Found " ).append( limbo.size() ).append( " unlisted patch files:" );
+ extraFileBuffer.append("Found ").append(limbo.size()).append(" unlisted patch files:");
- for ( Object foundPatchFile : foundPatchFiles )
- {
+ for (Object foundPatchFile : foundPatchFiles) {
String patch = (String) foundPatchFile;
- extraFileBuffer.append( "\n \'" ).append( patch ).append( '\'' );
+ extraFileBuffer.append("\n \'").append(patch).append('\'');
}
- extraFileBuffer.append(
- "\n\nEither remove these files, " + "add them to the patches configuration list, "
- + "or relax strictPatching." );
+ extraFileBuffer.append( "\n\nEither remove these files, "
+ + "add them to the patches configuration list, " + "or relax strictPatching." );
throw new MojoExecutionException( extraFileBuffer.toString() );
}
@@ -430,48 +419,38 @@ public class ApplyMojo
// used if failFast is false
List failedPatches = new ArrayList();
- for ( Object o : patchesApplied.entrySet() )
- {
+ for (Object o : patchesApplied.entrySet()) {
Entry entry = (Entry) o;
String patchName = (String) entry.getKey();
Commandline cli = (Commandline) entry.getValue();
- try
- {
- getLog().info( "Applying patch: " + patchName );
+ try {
+ getLog().info("Applying patch: " + patchName);
- int result = executeCommandLine( cli, consumer, consumer );
+ int result = executeCommandLine(cli, consumer, consumer);
- if ( result != 0 )
- {
- if ( failFast )
- {
- throw new MojoExecutionException(
- "Patch command failed with exit code " + result + " for " + patchName
- + ". Please see console and debug output for more information." );
- }
- else
- {
- failedPatches.add( patchName );
+ if (result != 0) {
+ if (failFast) {
+ throw new MojoExecutionException("Patch command failed with exit code " + result + " for "
+ + patchName + ". Please see console and debug output for more information.");
+ } else {
+ failedPatches.add(patchName);
}
}
- }
- catch ( CommandLineException e )
- {
- throw new MojoExecutionException(
- "Failed to apply patch: " + patchName + ". See debug output for more information.", e );
+ } catch (CommandLineException e) {
+ throw new MojoExecutionException("Failed to apply patch: " + patchName
+ + ". See debug output for more information.", e);
}
}
if ( !failedPatches.isEmpty() )
{
getLog().error( "Failed applying one or more patches:" );
- for ( Object failedPatche : failedPatches )
- {
- getLog().error( "* " + failedPatche );
+ for (Object failedPatche : failedPatches) {
+ getLog().error("* " + failedPatche);
}
throw new MojoExecutionException( "Patch command failed for one or more patches."
- + " Please see console and debug output for more information." );
+ + " Please see console and debug output for more information." );
}
return outputWriter.toString();
@@ -536,15 +515,12 @@ public class ApplyMojo
private void checkForWatchPhrases( String output )
throws MojoExecutionException
{
- for ( Object failurePhrase : failurePhrases )
- {
+ for (Object failurePhrase : failurePhrases) {
String phrase = (String) failurePhrase;
- if ( output.contains( phrase ) )
- {
- throw new MojoExecutionException(
- "Failed to apply patches (detected watch-phrase: \'" + phrase + "\' in output). "
- + "If this is in error, configure the patchFailureWatchPhrases parameter." );
+ if (output.contains(phrase)) {
+ throw new MojoExecutionException("Failed to apply patches (detected watch-phrase: \'" + phrase
+ + "\' in output). " + "If this is in error, configure the patchFailureWatchPhrases parameter.");
}
}
}
Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java Tue Aug 27 18:25:03 2013
@@ -48,14 +48,10 @@ import org.apache.commons.io.input.XmlSt
*/
public class DocumentModelBuilder
{
- /**
- * A MavenProject to extract the information.
- */
+ /** A MavenProject to extract the information. */
private final MavenProject project;
- /**
- * A DecorationModel to extract additional information.
- */
+ /** A DecorationModel to extract additional information. */
private final DecorationModel decorationModel;
/**
@@ -71,7 +67,7 @@ public class DocumentModelBuilder
/**
* Constructor. Initialize a MavenProject and a DecorationModel to extract information from.
*
- * @param project a MavenProject. May be null.
+ * @param project a MavenProject. May be null.
* @param decorationModel a DecorationModel. May be null.
*/
public DocumentModelBuilder( MavenProject project, DecorationModel decorationModel )
@@ -108,20 +104,22 @@ public class DocumentModelBuilder
/**
* Extract a DocumentModel from a MavenProject.
*
- * @param project a MavenProject. May be null.
+ * @param project a MavenProject. May be null.
* @param decorationModel a DecorationModel. May be null.
- * @param date the date of the TOC. May be null in which case the build date will be used.
+ * @param date the date of the TOC. May be null in which case the build date will be used.
+ *
* @return a DocumentModel. Always non-null.
*/
- private static DocumentModel getDocumentModel( MavenProject project, DecorationModel decorationModel, Date date )
+ private static DocumentModel getDocumentModel( MavenProject project,
+ DecorationModel decorationModel, Date date )
{
final Date now = ( date == null ? new Date() : date );
final DocumentModel docModel = new DocumentModel();
docModel.setModelEncoding( getProjectModelEncoding( project ) );
- docModel.setOutputName(
- project == null || project.getArtifactId() == null ? "unnamed" : project.getArtifactId() );
+ docModel.setOutputName( project == null || project.getArtifactId() == null
+ ? "unnamed" : project.getArtifactId() );
docModel.setMeta( getDocumentMeta( project, now ) );
docModel.setCover( getDocumentCover( project, now ) );
docModel.setToc( getDocumentTOC( decorationModel ) );
@@ -141,7 +139,7 @@ public class DocumentModelBuilder
if ( decorationModel != null && decorationModel.getMenus() != null )
{
- for ( final Menu menu : decorationModel.getMenus() )
+ for ( final Menu menu : decorationModel.getMenus() )
{
for ( final MenuItem item : menu.getItems() )
{
@@ -160,7 +158,8 @@ public class DocumentModelBuilder
* Extract meta information from a MavenProject.
*
* @param project a MavenProject. May be null.
- * @param date the date to use in meta. May be null.
+ * @param date the date to use in meta. May be null.
+ *
* @return a DocumentMeta object. Always non-null.
*/
private static DocumentMeta getDocumentMeta( MavenProject project, Date date )
@@ -186,7 +185,8 @@ public class DocumentModelBuilder
* Extract information for a DocumentCover from a MavenProject.
*
* @param project a MavenProject. May be null.
- * @param date the cover date. May be null.
+ * @param date the cover date. May be null.
+ *
* @return a DocumentCover object. Always non-null.
*/
private static DocumentCover getDocumentCover( MavenProject project, Date date )
@@ -212,7 +212,7 @@ public class DocumentModelBuilder
*
* @param project the MavenProject to extract the authors from.
* @return a list of DocumentAuthors from the project developers.
- * Returns null if project is null or contains no developers.
+ * Returns null if project is null or contains no developers.
*/
private static List<DocumentAuthor> getAuthors( MavenProject project )
{
@@ -223,34 +223,28 @@ public class DocumentModelBuilder
final List<DocumentAuthor> ret = new ArrayList<DocumentAuthor>( 4 );
- for ( Object o : project.getDevelopers() )
- {
+ for (Object o : project.getDevelopers()) {
final Developer developer = (Developer) o;
final DocumentAuthor author = new DocumentAuthor();
- author.setName( developer.getName() );
- author.setEmail( developer.getEmail() );
- author.setCompanyName( developer.getOrganization() );
+ author.setName(developer.getName());
+ author.setEmail(developer.getEmail());
+ author.setCompanyName(developer.getOrganization());
StringBuilder roles = null;
- for ( final String role : developer.getRoles() )
- {
- if ( roles == null )
- {
- roles = new StringBuilder( 32 );
+ for (final String role : developer.getRoles()) {
+ if (roles == null) {
+ roles = new StringBuilder(32);
+ } else {
+ roles.append(',').append(' ');
}
- else
- {
- roles.append( ',' ).append( ' ' );
- }
- roles.append( role );
+ roles.append(role);
}
- if ( roles != null )
- {
- author.setPosition( roles.toString() );
+ if (roles != null) {
+ author.setPosition(roles.toString());
}
- ret.add( author );
+ ret.add(author);
}
return ret;
@@ -262,8 +256,8 @@ public class DocumentModelBuilder
*/
private static String getProjectOrganizationName( MavenProject project )
{
- if ( project != null && project.getOrganization() != null && StringUtils.isNotEmpty(
- project.getOrganization().getName() ) )
+ if ( project != null && project.getOrganization() != null
+ && StringUtils.isNotEmpty( project.getOrganization().getName() ) )
{
return project.getOrganization().getName();
}
@@ -276,7 +270,7 @@ public class DocumentModelBuilder
*
* @param project the MavenProject to extract the project name from.
* @return the project name, or the project groupId and artifactId if
- * the project name is empty, or null if project is null.
+ * the project name is empty, or null if project is null.
*/
private static String getProjectName( MavenProject project )
{
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=1517906&r1=1517905&r2=1517906&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 Aug 27 18:25:03 2013
@@ -125,8 +125,7 @@ import org.codehaus.plexus.util.xml.pull
*/
@Mojo( name = "pdf", threadSafe = true )
public class PdfMojo
- extends AbstractMojo
- implements Contextualizable
+ extends AbstractMojo implements Contextualizable
{
/**
* The vm line separator
@@ -273,7 +272,7 @@ public class PdfMojo
*
* @since 1.1
*/
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}" )
+ @Parameter( defaultValue = "${project.remoteArtifactRepositories}" )
private List<ArtifactRepository> remoteRepositories;
/**
@@ -319,15 +318,14 @@ public class PdfMojo
*/
@Parameter( property = "validate", defaultValue = "false" )
private boolean validate;
-
+
/**
* Reports (Maven 2).
- *
* @since 1.3
*/
@Parameter( defaultValue = "${reports}", required = true, readonly = true )
private MavenReport[] reports;
-
+
/**
* <p>Configuration section <b>used internally</b> by Maven 3.</p>
* <p>More details available here:
@@ -348,7 +346,6 @@ public class PdfMojo
/**
* The current document Renderer.
- *
* @see #implementation
*/
private DocumentRenderer docRenderer;
@@ -388,7 +385,7 @@ public class PdfMojo
* @since 1.1
*/
private Map<Locale, List<MavenReport>> generatedMavenReports;
-
+
/**
* @since 1.3
*/
@@ -398,9 +395,7 @@ public class PdfMojo
// Public methods
// ----------------------------------------------------------------------
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -426,10 +421,8 @@ public class PdfMojo
throw new MojoExecutionException( "Error copying generated PDF: " + e.getMessage(), e );
}
}
-
- /**
- * {@inheritDoc}
- */
+
+ /** {@inheritDoc} */
public void contextualize( Context context )
throws ContextException
{
@@ -455,15 +448,17 @@ public class PdfMojo
}
else
{
- getLog().warn( "Invalid 'implementation' parameter: '" + implementation + "', using 'fo' as default." );
+ getLog().warn( "Invalid 'implementation' parameter: '" + implementation
+ + "', using 'fo' as default." );
this.docRenderer = foRenderer;
}
- if ( !( "none".equalsIgnoreCase( generateTOC ) || "start".equalsIgnoreCase( generateTOC )
- || "end".equalsIgnoreCase( generateTOC ) ) )
+ if ( !( "none".equalsIgnoreCase( generateTOC )
+ || "start".equalsIgnoreCase( generateTOC ) || "end".equalsIgnoreCase( generateTOC ) ) )
{
- getLog().warn( "Invalid 'generateTOC' parameter: '" + generateTOC + "', using 'start' as default." );
+ getLog().warn( "Invalid 'generateTOC' parameter: '" + generateTOC
+ + "', using 'start' as default." );
this.generateTOC = "start";
}
@@ -473,7 +468,7 @@ public class PdfMojo
* Copy the generated PDF to outputDirectory.
*
* @throws MojoExecutionException if any
- * @throws IOException if any
+ * @throws IOException if any
* @since 1.1
*/
private void copyGeneratedPdf()
@@ -492,7 +487,7 @@ public class PdfMojo
for ( final Locale locale : getAvailableLocales() )
{
- File generatedPdfSource = new File( getLocaleDirectory( workingDirectory, locale ), outputName );
+ File generatedPdfSource = new File( getLocaleDirectory( workingDirectory, locale), outputName );
if ( !generatedPdfSource.exists() )
{
@@ -500,7 +495,7 @@ public class PdfMojo
continue;
}
- File generatedPdfDest = new File( getLocaleDirectory( outputDirectory, locale ), outputName );
+ File generatedPdfDest = new File( getLocaleDirectory( outputDirectory, locale), outputName );
FileUtils.copyFile( generatedPdfSource, generatedPdfDest );
generatedPdfSource.delete();
@@ -511,7 +506,7 @@ public class PdfMojo
* Generate the PDF.
*
* @throws MojoExecutionException if any
- * @throws IOException if any
+ * @throws IOException if any
* @since 1.1
*/
private void generatePdf()
@@ -537,7 +532,7 @@ public class PdfMojo
context.put( "StringUtils", new StringUtils() );
context.put( "i18n", i18n );
context.put( "generateTOC", generateTOC );
- context.put( "validate", validate );
+ context.put( "validate", validate);
final DocumentModel model = aggregate ? getDocumentModel( locale ) : null;
@@ -610,8 +605,8 @@ public class PdfMojo
// Remove SCM files
List<String> files =
- FileUtils.getFileAndDirectoryNames( tmpSiteDir, FileUtils.getDefaultExcludesAsString(), null, true, true,
- true, true );
+ FileUtils.getFileAndDirectoryNames( tmpSiteDir, FileUtils.getDefaultExcludesAsString(), null, true,
+ true, true, true );
for ( final String fileName : files )
{
final File file = new File( fileName );
@@ -633,7 +628,7 @@ public class PdfMojo
* Copy the from site dir to the to dir.
*
* @param from not null
- * @param to not null
+ * @param to not null
* @throws IOException if any
* @since 1.1
*/
@@ -734,8 +729,7 @@ public class PdfMojo
*
* @param locale used to set the language.
* @return the DocumentModel read from the configured document descriptor.
- * @throws org.apache.maven.plugin.MojoExecutionException
- * if the model could not be read.
+ * @throws org.apache.maven.plugin.MojoExecutionException if the model could not be read.
*/
private DocumentModel getDocumentModelFromDescriptor( Locale locale )
throws MojoExecutionException
@@ -744,7 +738,8 @@ public class PdfMojo
try
{
- model = new DocumentDescriptorReader( project, getLog() ).readAndFilterDocumentDescriptor( docDescriptor );
+ model =
+ new DocumentDescriptorReader( project, getLog() ).readAndFilterDocumentDescriptor( docDescriptor );
}
catch ( XmlPullParserException ex )
{
@@ -777,7 +772,7 @@ public class PdfMojo
* Return the directory for a given Locale and the current default Locale.
*
* @param basedir the base directory
- * @param locale a Locale.
+ * @param locale a Locale.
* @return File.
*/
private File getLocaleDirectory( File basedir, Locale locale )
@@ -894,8 +889,9 @@ public class PdfMojo
File skinFile;
try
{
- skinFile = siteTool.getSkinArtifactFromRepository( localRepository, project.getRemoteArtifactRepositories(),
- decorationModel ).getFile();
+ skinFile =
+ siteTool.getSkinArtifactFromRepository( localRepository, project.getRemoteArtifactRepositories(),
+ decorationModel ).getFile();
}
catch ( SiteToolException e )
{
@@ -985,7 +981,7 @@ public class PdfMojo
*
* @param locale not null
* @throws MojoExecutionException if any
- * @throws IOException if any
+ * @throws IOException if any
* @since 1.1
*/
private void generateMavenReports( Locale locale )
@@ -1002,7 +998,7 @@ public class PdfMojo
getLog().info( "No report was specified." );
return;
}
-
+
for ( final ReportPlugin reportPlugin : project.getReporting().getPlugins() )
{
final PluginDescriptor pluginDescriptor = getPluginDescriptor( reportPlugin );
@@ -1017,17 +1013,15 @@ public class PdfMojo
goals.add( goal );
}
}
-
+
List mojoDescriptors = pluginDescriptor.getMojos();
- for ( Object mojoDescriptor1 : mojoDescriptors )
- {
+ for (Object mojoDescriptor1 : mojoDescriptors) {
final MojoDescriptor mojoDescriptor = (MojoDescriptor) mojoDescriptor1;
- if ( goals.isEmpty() || ( !goals.isEmpty() && goals.contains( mojoDescriptor.getGoal() ) ) )
- {
- MavenReport report = getMavenReport( mojoDescriptor );
+ if (goals.isEmpty() || (!goals.isEmpty() && goals.contains(mojoDescriptor.getGoal()))) {
+ MavenReport report = getMavenReport(mojoDescriptor);
- generateMavenReport( report, mojoDescriptor.getPluginDescriptor().getPluginArtifact(), locale );
+ generateMavenReport(report, mojoDescriptor.getPluginDescriptor().getPluginArtifact(), locale);
}
}
}
@@ -1061,7 +1055,6 @@ public class PdfMojo
/**
* TODO olamy : remove when maven 3 will be the de facto standard :-)
- *
* @param reportPlugin not null
* @return the PluginDescriptor instance for the given reportPlugin.
* @throws MojoExecutionException if any
@@ -1126,8 +1119,8 @@ public class PdfMojo
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
try
{
- Thread.currentThread().setContextClassLoader(
- mojoDescriptor.getPluginDescriptor().getClassRealm().getClassLoader() );
+ Thread.currentThread()
+ .setContextClassLoader( mojoDescriptor.getPluginDescriptor().getClassRealm().getClassLoader() );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
@@ -1159,9 +1152,9 @@ public class PdfMojo
* Generate the given Maven report only if it is not an external report and the report could be generated.
*
* @param mojoDescriptor not null, to catch linkage error
- * @param report could be null
- * @param locale not null
- * @throws IOException if any
+ * @param report could be null
+ * @param locale not null
+ * @throws IOException if any
* @throws MojoExecutionException if any
* @see #isValidGeneratedReport(MojoDescriptor, File, String)
* @since 1.1
@@ -1213,12 +1206,12 @@ public class PdfMojo
File generatedReport = new File( outDir, report.getOutputName() + ".xml" );
String excludes = getDefaultExcludesWithLocales( getAvailableLocales(), getDefaultLocale() );
- List<String> files =
- FileUtils.getFileNames( siteDirectory, "*/" + report.getOutputName() + ".*", excludes, false );
+ List<String> files = FileUtils.getFileNames( siteDirectory, "*/" + report.getOutputName() + ".*", excludes, false );
if ( !locale.getLanguage().equals( defaultLocale.getLanguage() ) )
{
- files = FileUtils.getFileNames( new File( siteDirectory, locale.getLanguage() ),
- "*/" + report.getOutputName() + ".*", excludes, false );
+ files =
+ FileUtils.getFileNames( new File( siteDirectory, locale.getLanguage() ), "*/"
+ + report.getOutputName() + ".*", excludes, false );
}
if ( files.size() != 0 )
@@ -1227,8 +1220,10 @@ public class PdfMojo
if ( getLog().isInfoEnabled() )
{
- getLog().info( "Skipped \"" + report.getName( locale ) + "\" report, file \"" + report.getOutputName()
- + "\" already exists for the " + displayLanguage + " version." );
+ getLog().info(
+ "Skipped \"" + report.getName( locale ) + "\" report, file \""
+ + report.getOutputName() + "\" already exists for the " + displayLanguage
+ + " version." );
}
return;
@@ -1246,8 +1241,8 @@ public class PdfMojo
{
sink = new PdfSink( sw );
org.codehaus.doxia.sink.Sink proxy = (org.codehaus.doxia.sink.Sink) Proxy.newProxyInstance(
- org.codehaus.doxia.sink.Sink.class.getClassLoader(), new Class[]{ org.codehaus.doxia.sink.Sink.class },
- new SinkDelegate( sink ) );
+ org.codehaus.doxia.sink.Sink.class.getClassLoader(),
+ new Class[] { org.codehaus.doxia.sink.Sink.class }, new SinkDelegate( sink ) );
report.generate( proxy, locale );
}
catch ( MavenReportException e )
@@ -1303,7 +1298,7 @@ public class PdfMojo
* </item>
* </pre>
*
- * @param model not null
+ * @param model not null
* @param locale not null
* @see #generateMavenReports(Locale)
* @since 1.1
@@ -1349,8 +1344,8 @@ public class PdfMojo
if ( !locale.getLanguage().equals( getDefaultLocale().getLanguage() ) )
{
generatedDirs =
- FileUtils.getFileNames( new File( generatedSiteDirectory, locale.getLanguage() ), "*", excludes,
- true );
+ FileUtils.getFileNames( new File( generatedSiteDirectory, locale.getLanguage() ), "*",
+ excludes, true );
}
for ( final String generatedDir : generatedDirs )
@@ -1364,7 +1359,8 @@ public class PdfMojo
if ( !addedRef.contains( ref ) )
{
- final String title = getGeneratedDocumentTitle( new File( generatedDir, generatedFile ) );
+ final String title =
+ getGeneratedDocumentTitle( new File( generatedDir, generatedFile ) );
if ( title != null )
{
@@ -1434,13 +1430,14 @@ public class PdfMojo
/**
* Parsing the generated report to see if it is correct or not. Log the error for the user.
*
- * @param mojoDescriptor not null
+ * @param mojoDescriptor not null
* @param generatedReport not null
* @param localReportName not null
* @return <code>true</code> if Doxia is able to parse the generated report, <code>false</code> otherwise.
* @since 1.1
*/
- private boolean isValidGeneratedReport( Artifact pluginArtifact, File generatedReport, String localReportName )
+ private boolean isValidGeneratedReport( Artifact pluginArtifact, File generatedReport,
+ String localReportName )
{
SinkAdapter sinkAdapter = new SinkAdapter();
Reader reader = null;
@@ -1484,21 +1481,18 @@ public class PdfMojo
if ( pluginProject.getMailingLists() != null && !pluginProject.getMailingLists().isEmpty() )
{
boolean appended = false;
- for ( Object o : pluginProject.getMailingLists() )
- {
+ for (Object o : pluginProject.getMailingLists()) {
MailingList mailingList = (MailingList) o;
- if ( StringUtils.isNotEmpty( mailingList.getName() ) && StringUtils.isNotEmpty(
- mailingList.getPost() ) )
- {
- if ( !appended )
- {
- sb.append( " Mailing Lists:" ).append( EOL );
+ if (StringUtils.isNotEmpty(mailingList.getName())
+ && StringUtils.isNotEmpty(mailingList.getPost())) {
+ if (!appended) {
+ sb.append(" Mailing Lists:").append(EOL);
appended = true;
}
- sb.append( " " ).append( mailingList.getName() );
- sb.append( ": " ).append( mailingList.getPost() );
- sb.append( EOL );
+ sb.append(" ").append(mailingList.getName());
+ sb.append(": ").append(mailingList.getPost());
+ sb.append(EOL);
}
}
}
@@ -1508,8 +1502,8 @@ public class PdfMojo
sb.append( " " ).append( pluginProject.getUrl() );
sb.append( EOL );
}
- if ( pluginProject.getIssueManagement() != null && StringUtils.isNotEmpty(
- pluginProject.getIssueManagement().getUrl() ) )
+ if ( pluginProject.getIssueManagement() != null
+ && StringUtils.isNotEmpty( pluginProject.getIssueManagement().getUrl() ) )
{
sb.append( " Issue Tracking:" ).append( EOL );
sb.append( " " ).append( pluginProject.getIssueManagement().getUrl() );
@@ -1517,8 +1511,8 @@ public class PdfMojo
}
}
- sb.append( EOL ).append( "Ignoring the \"" ).append( localReportName ).append(
- "\" report in the PDF." ).append( EOL );
+ sb.append( EOL ).append( "Ignoring the \"" ).append( localReportName )
+ .append( "\" report in the PDF." ).append( EOL );
getLog().error( sb.toString() );
getLog().debug( e );
@@ -1566,7 +1560,7 @@ public class PdfMojo
return null;
}
-
+
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
@@ -1600,7 +1594,7 @@ public class PdfMojo
}
return reportExecutions;
}
-
+
/**
* Check the current Maven version to see if it's Maven 3.0 or newer.
*/
@@ -1625,8 +1619,8 @@ public class PdfMojo
// and that should have a pom.properties file
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
- final InputStream in = MavenProject.class.getClassLoader().getResourceAsStream(
- "META-INF/maven/org.apache.maven/maven-core/pom.properties" );
+ final InputStream in =
+ MavenProject.class.getClassLoader().getResourceAsStream( "META-INF/maven/org.apache.maven/maven-core/pom.properties" );
try
{
properties.load( in );
@@ -1654,7 +1648,7 @@ public class PdfMojo
* {@link org.apache.maven.reporting.AbstractMavenReport}.
*
* @param content the given content
- * @param toFile the report file
+ * @param toFile the report file
* @throws IOException if any
* @since 1.1
*/
@@ -1680,7 +1674,7 @@ public class PdfMojo
}
/**
- * @param locales the list of locales dir to exclude
+ * @param locales the list of locales dir to exclude
* @param defaultLocale the default locale.
* @return the comma separated list of default excludes and locales dir.
* @see FileUtils#getDefaultExcludesAsString()
@@ -1717,9 +1711,7 @@ public class PdfMojo
super( writer );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void text( String text )
{
// workaround to fix quotes introduced with MPIR-59 (then removed in MPIR-136)
@@ -1750,17 +1742,13 @@ public class PdfMojo
this.locale = locale;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getTitle()
{
return i18n.getString( "pdf-plugin", locale, "report.project-info.title" );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void renderBody()
{
sink.section1();
@@ -1783,7 +1771,7 @@ public class PdfMojo
sink.table();
- sink.tableRows( new int[]{ Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT }, false );
+ sink.tableRows( new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_LEFT }, false );
String name = i18n.getString( "pdf-plugin", locale, "report.project-info.column.document" );
String description = i18n.getString( "pdf-plugin", locale, "report.project-info.column.description" );
@@ -1847,9 +1835,7 @@ public class PdfMojo
this.sink = sink;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Object invoke( Object proxy, Method method, Object[] args )
throws Throwable
{
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java Tue Aug 27 18:25:03 2013
@@ -39,11 +39,12 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
+ *
* @author ltheussl
* @version $Id$
*/
public class DocumentModelBuilderTest
- extends PlexusTestCase
+ extends PlexusTestCase
{
/**
* Test of getDocumentModel method, of class DocumentModelBuilder.
@@ -77,12 +78,12 @@ public class DocumentModelBuilderTest
assertEquals( "v. Test Version", cover.getCoverSubTitle() );
assertEquals( "Test Organization", cover.getCompanyName() );
assertEquals( 2, cover.getAuthors().size() );
- assertFirstDocumentAuthor( cover.getAuthors().get( 0 ) );
+ assertFirstDocumentAuthor(cover.getAuthors().get( 0 ));
DocumentMeta meta = model.getMeta();
assertEquals( "Test Description", meta.getDescription() );
assertEquals( 2, meta.getAuthors().size() );
- assertFirstDocumentAuthor( meta.getAuthors().get( 0 ) );
+ assertFirstDocumentAuthor(meta.getAuthors().get( 0 ));
assertEquals( "Test Name", meta.getSubject() );
assertEquals( "Test Name", meta.getTitle() );
@@ -92,15 +93,15 @@ public class DocumentModelBuilderTest
/**
* Test of getDocumentModel method, of class DocumentModelBuilder.
- *
* @throws Exception if something happens.
*/
public void testGetDocumentModelWithSiteDescriptor()
- throws Exception
+ throws Exception
{
File descriptorFile = new File( testBaseDir() + "src/site/", "model_builder_site.xml" );
DecorationModel dModel = getDecorationModelFromFile( descriptorFile );
- DocumentModel model = new DocumentModelBuilder( new ModelBuilderMavenProjectStub(), dModel ).getDocumentModel();
+ DocumentModel model =
+ new DocumentModelBuilder( new ModelBuilderMavenProjectStub(), dModel ).getDocumentModel();
DocumentTOC toc = model.getToc();
assertEquals( 1, toc.getItems().size() );
@@ -117,7 +118,7 @@ public class DocumentModelBuilderTest
}
private DecorationModel getDecorationModelFromFile( File descriptorFile )
- throws IOException, XmlPullParserException
+ throws IOException, XmlPullParserException
{
Reader reader = null;
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java Tue Aug 27 18:25:03 2013
@@ -68,57 +68,43 @@ public class ModelBuilderMavenProjectStu
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public File getBasedir()
{
return new File( super.getBasedir(), "target/test-classes/unit/pdf/" );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void addDeveloper( Developer developer )
{
getModel().addDeveloper( developer );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public List getDevelopers()
{
return getModel().getDevelopers();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Organization getOrganization()
{
return getModel().getOrganization();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setDevelopers( List list )
{
getModel().setDevelopers( list );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void setOrganization( Organization organization )
{
getModel().setOrganization( organization );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public File getFile()
{
return new File( getBasedir(), "pom_model_builder.xml" );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168-empty-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168-empty-report/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168-empty-report/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168-empty-report/pom.xml Tue Aug 27 18:25:03 2013
@@ -19,8 +19,7 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugin.pmd.its</groupId>
@@ -53,13 +52,12 @@ under the License.
<verbose>true</verbose>
<minimumTokens>25</minimumTokens>
<sourceEncoding>UTF-8</sourceEncoding>
- <failOnViolation>false</failOnViolation>
- <!-- force execution of both goals, will be checked with verify-script -->
+ <failOnViolation>false</failOnViolation> <!-- force execution of both goals, will be checked with verify-script -->
</configuration>
</plugin>
</plugins>
</build>
-
+
<reporting>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168/pom.xml?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/it/mpmd-168/pom.xml Tue Aug 27 18:25:03 2013
@@ -19,8 +19,7 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugin.pmd.its</groupId>
@@ -53,13 +52,12 @@ under the License.
<verbose>true</verbose>
<minimumTokens>25</minimumTokens>
<sourceEncoding>UTF-8</sourceEncoding>
- <failOnViolation>false</failOnViolation>
- <!-- force execution of both goals, will be checked with verify-script -->
+ <failOnViolation>false</failOnViolation> <!-- force execution of both goals, will be checked with verify-script -->
</configuration>
</plugin>
</plugins>
</build>
-
+
<reporting>
<plugins>
<plugin>
@@ -67,7 +65,7 @@ under the License.
<artifactId>maven-pmd-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <!-- <skipEmptyReport>true</skipEmptyReport> it's by default true -->
+<!-- <skipEmptyReport>true</skipEmptyReport> it's by default true -->
</configuration>
</plugin>
<plugin>
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java Tue Aug 27 18:25:03 2013
@@ -202,9 +202,7 @@ public abstract class AbstractPmdReport
@Parameter( defaultValue = "true" )
protected boolean skipEmptyReport;
- /**
- * The files that are being analyzed.
- */
+ /** The files that are being analyzed. */
protected Map<File, PmdFileInfo> filesToProcess;
/**
@@ -288,11 +286,9 @@ public abstract class AbstractPmdReport
Collection<File> excludeRootFiles = new HashSet<File>( excludeRoots.length );
- for ( File file : excludeRoots )
- {
- if ( file.isDirectory() )
- {
- excludeRootFiles.add( file );
+ for (File file : excludeRoots) {
+ if (file.isDirectory()) {
+ excludeRootFiles.add(file);
}
}
@@ -359,9 +355,8 @@ public abstract class AbstractPmdReport
{
@SuppressWarnings( "unchecked" ) List<File> newfiles =
FileUtils.getFiles( sourceDirectory, including, excluding );
- for ( File newfile : newfiles )
- {
- files.put( newfile.getCanonicalFile(), finfo );
+ for (File newfile : newfiles) {
+ files.put(newfile.getCanonicalFile(), finfo);
}
}
}
@@ -408,7 +403,6 @@ public abstract class AbstractPmdReport
{
return "html".equals( format );
}
-
protected boolean isXml()
{
return "xml".equals( format );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java Tue Aug 27 18:25:03 2013
@@ -81,7 +81,7 @@ public abstract class AbstractPmdViolati
*
* @since 3.0
*/
- @Parameter( property = "pmd.printFailingErrors", defaultValue = "false" )
+ @Parameter(property = "pmd.printFailingErrors", defaultValue = "false")
private boolean printFailingErrors;
/**
@@ -91,7 +91,7 @@ public abstract class AbstractPmdViolati
*
* @since 3.0
*/
- @Parameter( property = "pmd.excludeFromFailureFile", defaultValue = "" )
+ @Parameter(property = "pmd.excludeFromFailureFile", defaultValue = "")
private String excludeFromFailureFile;
/**
@@ -100,8 +100,7 @@ public abstract class AbstractPmdViolati
@Component
protected MavenProject project;
- protected void executeCheck( final String filename, final String tagName, final String key,
- final int failurePriority )
+ protected void executeCheck( final String filename, final String tagName, final String key, final int failurePriority )
throws MojoFailureException, MojoExecutionException
{
if ( aggregate && !project.isExecutionRoot() )
@@ -247,8 +246,7 @@ public abstract class AbstractPmdViolati
{
if ( failureCount > 0 )
{
- message.append( "You have " ).append( failureCount ).append( " " ).append( key ).append(
- failureCount > 1 ? "s" : "" );
+ message.append("You have ").append(failureCount).append(" ").append(key).append(failureCount > 1 ? "s" : "");
}
if ( warningCount > 0 )
@@ -261,7 +259,7 @@ public abstract class AbstractPmdViolati
{
message.append( "You have " );
}
- message.append( warningCount ).append( " warning" ).append( warningCount > 1 ? "s" : "" );
+ message.append(warningCount).append(" warning").append(warningCount > 1 ? "s" : "");
}
message.append( ". For more details see:" ).append( outputFile.getAbsolutePath() );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java Tue Aug 27 18:25:03 2013
@@ -78,16 +78,16 @@ public class CpdReportTest
// check the contents of cpd.html
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "AppSample.java".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("AppSample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "App.java".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("App.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "public String dup( String str )".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("public String dup( String str )".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "tmp = tmp + str.substring( i, i + 1);".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("tmp = tmp + str.substring( i, i + 1);".toLowerCase()));
}
@@ -114,20 +114,20 @@ public class CpdReportTest
// Contents that should NOT be in the report
String str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "/Sample.java".toLowerCase() ) );
+ assertTrue(!str.toLowerCase().contains("/Sample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "public void duplicateMethod( int i )".toLowerCase() ) );
+ assertTrue(!str.toLowerCase().contains("public void duplicateMethod( int i )".toLowerCase()));
// Contents that should be in the report
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "AnotherSample.java".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("AnotherSample.java".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "public static void main( String[] args )".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("public static void main( String[] args )".toLowerCase()));
str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/cpd.html" ) );
- assertTrue( str.toLowerCase().contains( "private String unusedMethod(".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("private String unusedMethod(".toLowerCase()));
}
@@ -210,10 +210,9 @@ public class CpdReportTest
}
public void testSkipEmptyReportConfiguration()
- throws Exception
+ throws Exception
{
- File testPom =
- new File( getBasedir(), "src/test/resources/unit/empty-report/cpd-skip-empty-report-plugin-config.xml" );
+ File testPom = new File( getBasedir(), "src/test/resources/unit/empty-report/cpd-skip-empty-report-plugin-config.xml" );
CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom );
mojo.execute();
@@ -223,10 +222,9 @@ public class CpdReportTest
}
public void testEmptyReportConfiguration()
- throws Exception
+ throws Exception
{
- File testPom =
- new File( getBasedir(), "src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml" );
+ File testPom = new File( getBasedir(), "src/test/resources/unit/empty-report/cpd-empty-report-plugin-config.xml" );
CpdReport mojo = (CpdReport) lookupMojo( "cpd", testPom );
mojo.execute();
@@ -234,7 +232,7 @@ public class CpdReportTest
File generatedFile = new File( getBasedir(), "target/test/unit/empty-report/target/site/cpd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(), "target/test/unit/empty-report/target/site/cpd.html" ) );
- assertTrue( !str.toLowerCase().contains( "Hello.java".toLowerCase() ) );
+ assertTrue(!str.toLowerCase().contains("Hello.java".toLowerCase()));
}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java Tue Aug 27 18:25:03 2013
@@ -80,9 +80,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue( str.contains( "/xref/def/configuration/App.html#31" ) );
+ assertTrue(str.contains("/xref/def/configuration/App.html#31"));
- assertTrue( str.contains( "/xref/def/configuration/AppSample.html#45" ) );
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
}
@@ -114,7 +114,7 @@ public class PmdReportTest
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( generatedFile );
- assertTrue( str.contains( "Avoid using global variables" ) );
+ assertTrue(str.contains("Avoid using global variables"));
}
public void testFileURL()
@@ -156,9 +156,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue( str.contains( "/xref/def/configuration/App.html#31" ) );
+ assertTrue(str.contains("/xref/def/configuration/App.html#31"));
- assertTrue( str.contains( "/xref/def/configuration/AppSample.html#45" ) );
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
}
/**
@@ -189,14 +189,13 @@ public class PmdReportTest
//check if custom ruleset was applied
String str = readFile( new File( getBasedir(), "target/test/unit/custom-configuration/target/site/pmd.html" ) );
- assertTrue( str.toLowerCase().contains( "Avoid using if statements without curly braces".toLowerCase() ) );
+ assertTrue(str.toLowerCase().contains("Avoid using if statements without curly braces".toLowerCase()));
assertTrue(
- str.toLowerCase().contains( "Avoid using if...else statements without curly braces".toLowerCase() ) );
+ str.toLowerCase().contains("Avoid using if...else statements without curly braces".toLowerCase()));
assertTrue( "unnecessary constructor should not be triggered because of low priority",
- !str.toLowerCase().contains(
- "Avoid unnecessary constructors - the compiler will generate these for you".toLowerCase() ) );
+ !str.toLowerCase().contains("Avoid unnecessary constructors - the compiler will generate these for you".toLowerCase()));
}
@@ -226,8 +225,7 @@ public class PmdReportTest
public void testSkipEmptyReportConfiguration()
throws Exception
{
- File testPom =
- new File( getBasedir(), "src/test/resources/unit/empty-report/skip-empty-report-plugin-config.xml" );
+ File testPom = new File( getBasedir(), "src/test/resources/unit/empty-report/skip-empty-report-plugin-config.xml" );
PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom );
mojo.execute();
@@ -237,7 +235,7 @@ public class PmdReportTest
}
public void testEmptyReportConfiguration()
- throws Exception
+ throws Exception
{
File testPom = new File( getBasedir(), "src/test/resources/unit/empty-report/empty-report-plugin-config.xml" );
PmdReport mojo = (PmdReport) lookupMojo( "pmd", testPom );
@@ -247,7 +245,7 @@ public class PmdReportTest
File generatedFile = new File( getBasedir(), "target/test/unit/empty-report/target/site/pmd.html" );
assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
String str = readFile( new File( getBasedir(), "target/test/unit/empty-report/target/site/pmd.html" ) );
- assertTrue( !str.toLowerCase().contains( "Hello.java".toLowerCase() ) );
+ assertTrue(!str.toLowerCase().contains("Hello.java".toLowerCase()));
}
public void testInvalidFormat()
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java Tue Aug 27 18:25:03 2013
@@ -35,7 +35,7 @@ public class App
/**
* The main method
*
- * @param args an array of strings that contains the arguments
+ * @param args an array of strings that contains the arguments
*/
public static void main( String[] args )
{
@@ -45,7 +45,7 @@ public class App
/**
* Sample method
*
- * @param str the value to be displayed
+ * @param str the value to be displayed
*/
protected void sampleMethod( String str )
{
@@ -65,7 +65,7 @@ public class App
* @param unusedParam1
* @param unusedParam2
*/
- public void testMethod( String unusedParam1, String unusedParam2 )
+ public void testMethod( String unusedParam1, String unusedParam2)
{
System.out.println( "Test method" );
}
@@ -75,11 +75,11 @@ public class App
{
String tmp = "";
- for ( int i = 0; i < str.length(); i++ )
+ for( int i = 0; i < str.length(); i++ )
{
- if ( i != ( str.length() - 1 ) )
+ if ( i != ( str.length() -1 ) )
{
- tmp = tmp + str.substring( i, i + 1 );
+ tmp = tmp + str.substring( i, i + 1);
}
else
{
@@ -87,9 +87,9 @@ public class App
}
}
- if ( "".equals( tmp ) )
+ if ("".equals( tmp ))
{
- tmp = "EMPTY";
+ tmp = "EMPTY";
}
System.out.println( "The value of tmp is " + tmp );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java Tue Aug 27 18:25:03 2013
@@ -29,7 +29,7 @@ public class AppSample
/**
* The main method
*
- * @param args an array of strings that contains the arguments
+ * @param args an array of strings that contains the arguments
*/
public static void main( String[] args )
{
@@ -53,11 +53,11 @@ public class AppSample
{
String tmp = "";
- for ( int i = 0; i < str.length(); i++ )
+ for( int i = 0; i < str.length(); i++ )
{
- if ( i != ( str.length() - 1 ) )
+ if ( i != ( str.length() -1 ) )
{
- tmp = tmp + str.substring( i, i + 1 );
+ tmp = tmp + str.substring( i, i + 1);
}
else
{
@@ -65,9 +65,9 @@ public class AppSample
}
}
- if ( "".equals( tmp ) )
+ if ("".equals( tmp ))
{
- tmp = "EMPTY";
+ tmp = "EMPTY";
}
System.out.println( "The value of tmp is " + tmp );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1517906&r1=1517905&r2=1517906&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Aug 27 18:25:03 2013
@@ -193,8 +193,7 @@ public abstract class AbstractProjectInf
siteTool.getDefaultSkinArtifact( localRepository, project.getRemoteArtifactRepositories() );
SiteRenderingContext siteContext =
- siteRenderer.createContextForSkin( defaultSkin.getFile(), attributes, model, getName( locale ),
- locale );
+ siteRenderer.createContextForSkin( defaultSkin.getFile(), attributes, model, getName( locale ), locale );
RenderingContext context = new RenderingContext( outputDirectory, filename );
@@ -213,23 +212,23 @@ public abstract class AbstractProjectInf
}
catch ( RendererException e )
{
- throw new MojoExecutionException(
- "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e );
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ + " report generation.", e );
}
catch ( IOException e )
{
- throw new MojoExecutionException(
- "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e );
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ + " report generation.", e );
}
catch ( SiteToolException e )
{
- throw new MojoExecutionException(
- "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e );
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ + " report generation.", e );
}
catch ( MavenReportException e )
{
- throw new MojoExecutionException(
- "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e );
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH )
+ + " report generation.", e );
}
finally
{
@@ -270,7 +269,7 @@ public abstract class AbstractProjectInf
{
return project;
}
-
+
protected Plugin getPlugin( String pluginId )
{
if ( ( getProject().getBuild() == null ) || ( getProject().getBuild().getPluginsAsMap() == null ) )
@@ -281,22 +280,22 @@ public abstract class AbstractProjectInf
Plugin plugin = (Plugin) getProject().getBuild().getPluginsAsMap().get( pluginId );
if ( ( plugin == null ) && ( getProject().getBuild().getPluginManagement() != null ) && (
- getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) )
+ getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) )
{
plugin = (Plugin) getProject().getBuild().getPluginManagement().getPluginsAsMap().get( pluginId );
}
return plugin;
}
-
+
protected String getPluginParameter( String pluginId, String param )
{
Plugin plugin = getPlugin( pluginId );
if ( plugin != null )
{
Xpp3Dom xpp3Dom = (Xpp3Dom) plugin.getConfiguration();
- if ( xpp3Dom != null && xpp3Dom.getChild( param ) != null && StringUtils.isNotEmpty(
- xpp3Dom.getChild( param ).getValue() ) )
+ if ( xpp3Dom != null && xpp3Dom.getChild( param ) != null
+ && StringUtils.isNotEmpty( xpp3Dom.getChild( param ).getValue() ) )
{
return xpp3Dom.getChild( param ).getValue();
}
@@ -340,17 +339,13 @@ public abstract class AbstractProjectInf
protected abstract String getI18Nsection();
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getName( Locale locale )
{
return getI18nString( locale, "name" );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDescription( Locale locale )
{
return getI18nString( locale, "description" );
@@ -387,7 +382,7 @@ public abstract class AbstractProjectInf
URLClassLoader classLoader = null;
try
{
- classLoader = new URLClassLoader( new URL[]{ customBundleFile.getParentFile().toURI().toURL() } );
+ classLoader = new URLClassLoader( new URL[] { customBundleFile.getParentFile().toURI().toURL() } );
}
catch ( MalformedURLException e )
{
@@ -400,97 +395,73 @@ public abstract class AbstractProjectInf
}
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDefaultLanguage()
{
return locale.getLanguage();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDefaultCountry()
{
return locale.getCountry();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getDefaultBundleName()
{
return bundleName;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String[] getBundleNames()
{
- return new String[]{ bundleName };
+ return new String[] { bundleName };
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getBundle()
{
return bundle;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getBundle( String bundleName )
{
return bundle;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getBundle( String bundleName, String languageHeader )
{
return bundle;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getBundle( String bundleName, Locale locale )
{
return bundle;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public Locale getLocale( String languageHeader )
{
return new Locale( languageHeader );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getString( String key )
{
return getString( bundleName, locale, key );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getString( String key, Locale locale )
{
return getString( bundleName, locale, key );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String getString( String bundleName, Locale locale, String key )
{
String value;
@@ -509,7 +480,7 @@ public abstract class AbstractProjectInf
value = i18nOriginal.getString( bundleName, locale, key );
}
- if ( !value.contains( "${" ) )
+ if (!value.contains("${"))
{
return value;
}
@@ -540,41 +511,31 @@ public abstract class AbstractProjectInf
return value;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String format( String key, Object arg1 )
{
- return format( bundleName, locale, key, new Object[]{ arg1 } );
+ return format( bundleName, locale, key, new Object[] { arg1 } );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String format( String key, Object arg1, Object arg2 )
{
- return format( bundleName, locale, key, new Object[]{ arg1, arg2 } );
+ return format( bundleName, locale, key, new Object[] { arg1, arg2 } );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String format( String bundleName, Locale locale, String key, Object arg1 )
{
- return format( bundleName, locale, key, new Object[]{ arg1 } );
+ return format( bundleName, locale, key, new Object[] { arg1 } );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String format( String bundleName, Locale locale, String key, Object arg1, Object arg2 )
{
- return format( bundleName, locale, key, new Object[]{ arg1, arg2 } );
+ return format( bundleName, locale, key, new Object[] { arg1, arg2 } );
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public String format( String bundleName, Locale locale, String key, Object[] args )
{
if ( locale == null )