You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2014/03/11 20:20:27 UTC
svn commit: r1576478 -
/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/
Author: dennisl
Date: Tue Mar 11 19:20:27 2014
New Revision: 1576478
URL: http://svn.apache.org/r1576478
Log:
Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
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=1576478&r1=1576477&r2=1576478&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 Mar 11 19:20:27 2014
@@ -283,9 +283,11 @@ 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 );
}
}
@@ -367,8 +369,9 @@ 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 );
}
}
}
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=1576478&r1=1576477&r2=1576478&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 Mar 11 19:20:27 2014
@@ -25,13 +25,11 @@ import org.apache.maven.plugin.MojoFailu
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.IOException;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
@@ -81,7 +79,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 +89,7 @@ public abstract class AbstractPmdViolati
*
* @since 3.0
*/
- @Parameter(property = "pmd.excludeFromFailureFile", defaultValue = "")
+ @Parameter( property = "pmd.excludeFromFailureFile", defaultValue = "" )
private String excludeFromFailureFile;
/**
@@ -100,7 +98,8 @@ 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() )
@@ -246,7 +245,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 )
@@ -259,7 +258,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/main/java/org/apache/maven/plugin/pmd/CpdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java Tue Mar 11 19:20:27 2014
@@ -167,7 +167,7 @@ public class CpdReport
result = cpd.getMatches().hasNext();
if ( result )
{
- getLog().debug("Skipping Report as skipEmptyReport is true and there are no CPD issues.");
+ getLog().debug( "Skipping Report as skipEmptyReport is true and there are no CPD issues." );
}
}
}
@@ -300,7 +300,8 @@ public class CpdReport
writer.write( buffer );
writer.close();
- if ( includeXmlInSite ) {
+ if ( includeXmlInSite )
+ {
File siteDir = getReportOutputDirectory();
siteDir.mkdirs();
FileUtils.copyFile( targetFile, new File( siteDir, "cpd." + format ) );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java Tue Mar 11 19:20:27 2014
@@ -90,7 +90,7 @@ public class CpdViolationCheckMojo
int lines = item.getLines();
StringBuilder buff = new StringBuilder( 100 );
- buff.append("CPD ").append(severity).append(": Found ");
+ buff.append( "CPD " ).append( severity ).append( ": Found " );
buff.append( lines ).append( " lines of duplicated code at locations:" );
this.getLog().info( buff.toString() );
@@ -128,8 +128,8 @@ public class CpdViolationCheckMojo
}
for ( final Set<String> singleExclusionGroup : exclusionList )
{
- if ( uniquePaths.size() == singleExclusionGroup.size() && duplicationExcludedByGroup( uniquePaths,
- singleExclusionGroup ) )
+ if ( uniquePaths.size() == singleExclusionGroup.size()
+ && duplicationExcludedByGroup( uniquePaths, singleExclusionGroup ) )
{
return true;
}
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java Tue Mar 11 19:20:27 2014
@@ -237,7 +237,7 @@ public class PmdReport
result = reportListener.hasViolations();
if ( result )
{
- getLog().debug("Skipping Report as skipEmptyReport is true and there are no PMD violations.");
+ getLog().debug( "Skipping Report as skipEmptyReport is true and there are no PMD violations." );
}
}
}
@@ -353,7 +353,8 @@ public class PmdReport
{
getLog().debug( "Executing PMD..." );
- PMD.processFiles( pmdConfiguration, ruleSetFactory, dataSources, ruleContext, Collections.<Renderer> emptyList() );
+ PMD.processFiles( pmdConfiguration, ruleSetFactory, dataSources, ruleContext,
+ Collections.<Renderer> emptyList() );
if ( getLog().isDebugEnabled() )
{
@@ -377,7 +378,8 @@ public class PmdReport
writeNonHtml( reportListener.asReport() );
}
- if ( benchmark ) {
+ if ( benchmark )
+ {
PrintStream benchmarkFileStream = null;
try
{
@@ -484,7 +486,8 @@ public class PmdReport
r.end();
writer.close();
- if ( includeXmlInSite ) {
+ if ( includeXmlInSite )
+ {
File siteDir = getReportOutputDirectory();
siteDir.mkdirs();
FileUtils.copyFile( targetFile, new File( siteDir, "pmd." + format ) );
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java Tue Mar 11 19:20:27 2014
@@ -42,7 +42,8 @@ import org.codehaus.plexus.util.StringUt
* @author Brett Porter
* @version $Id$
*/
-public class PmdReportGenerator {
+public class PmdReportGenerator
+{
private Log log;
private Sink sink;
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java Tue Mar 11 19:20:27 2014
@@ -59,7 +59,8 @@ public class PmdReportListener
/**
* Create a new single report with all violations for further rendering into other formats than HTML.
*/
- public Report asReport() {
+ public Report asReport()
+ {
Report report = new Report();
for ( RuleViolation v : violations )
{
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java?rev=1576478&r1=1576477&r2=1576478&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java Tue Mar 11 19:20:27 2014
@@ -154,7 +154,7 @@ public class PmdViolationCheckMojo
{
StringBuilder buff = new StringBuilder( 100 );
- buff.append("PMD ").append(severity).append(": ");
+ buff.append( "PMD " ).append( severity ).append( ": " );
if ( item.getViolationClass() != null )
{
if ( item.getViolationPackage() != null )