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 2007/12/27 17:59:50 UTC
svn commit: r607087 - in
/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd:
AbstractPmdViolationCheckMojo.java CpdReport.java PmdReport.java
Author: dennisl
Date: Thu Dec 27 08:59:50 2007
New Revision: 607087
URL: http://svn.apache.org/viewvc?rev=607087&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
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/PmdReport.java
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=607087&r1=607086&r2=607087&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 Thu Dec 27 08:59:50 2007
@@ -45,9 +45,9 @@
public abstract class AbstractPmdViolationCheckMojo
extends AbstractMojo
{
- private final Boolean FAILURES_KEY = Boolean.TRUE;
+ private static final Boolean FAILURES_KEY = Boolean.TRUE;
- private final Boolean WARNINGS_KEY = Boolean.FALSE;
+ private static final Boolean WARNINGS_KEY = Boolean.FALSE;
/**
* The location of the XML report to check, as generated by the PMD report.
@@ -285,7 +285,7 @@
*
* @param item
*/
- abstract protected void printError( Map item, String severity );
+ protected abstract void printError( Map item, String severity );
/**
* Gets the attributes and text for the violation tag and puts them in a
@@ -295,6 +295,6 @@
* @throws XmlPullParserException
* @throws IOException
*/
- abstract protected Map getErrorDetails( XmlPullParser xpp )
+ protected abstract Map getErrorDetails( XmlPullParser xpp )
throws XmlPullParserException, IOException;
}
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=607087&r1=607086&r2=607087&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 Thu Dec 27 08:59:50 2007
@@ -28,7 +28,6 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charset;
-import java.nio.charset.spi.CharsetProvider;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -156,8 +155,8 @@
try
{
targetDirectory.mkdirs();
- FileOutputStream tStream = new FileOutputStream(new File( targetDirectory, "cpd." + format ));
- Writer writer = new OutputStreamWriter(tStream, Charset.forName( "UTF-8" ));
+ FileOutputStream tStream = new FileOutputStream( new File( targetDirectory, "cpd." + format ) );
+ Writer writer = new OutputStreamWriter( tStream, Charset.forName( "UTF-8" ) );
writer.write( buffer, 0, buffer.length() );
writer.close();
@@ -202,7 +201,7 @@
Renderer renderer = null;
if ( "xml".equals( format ) )
{
- renderer = new XMLRenderer("UTF-8");
+ renderer = new XMLRenderer( "UTF-8" );
}
else if ( "csv".equals( format ) )
{
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=607087&r1=607086&r2=607087&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 Thu Dec 27 08:59:50 2007
@@ -31,7 +31,6 @@
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
-import java.net.URL;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -57,7 +56,6 @@
import org.codehaus.plexus.resource.loader.FileResourceCreationException;
import org.codehaus.plexus.resource.loader.FileResourceLoader;
import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
-import org.codehaus.plexus.util.FileUtils;
/**
* Implement the PMD report.
@@ -223,8 +221,9 @@
{
// PMD closes this Reader even though it did not open it so we have
// to open a new one with every call to processFile().
- Reader reader = hasEncoding ? new InputStreamReader( new FileInputStream( file ),
- sourceEncoding ) : new FileReader( file );
+ Reader reader = hasEncoding
+ ? new InputStreamReader( new FileInputStream( file ), sourceEncoding )
+ : new FileReader( file );
pmd.processFile( reader, sets[idx], ruleContext );
}
catch ( UnsupportedEncodingException e1 )
@@ -257,9 +256,9 @@
try
{
- r.setWriter(stringwriter);
+ r.setWriter( stringwriter );
r.start();
- r.renderFileReport(report);
+ r.renderFileReport( report );
r.end();
String buffer = stringwriter.toString();
@@ -323,12 +322,12 @@
if ( null != targetJdk )
{
- SourceType sourceType = SourceType.getSourceTypeForId("java " + targetJdk);
+ SourceType sourceType = SourceType.getSourceTypeForId( "java " + targetJdk );
if ( sourceType == null )
{
throw new MavenReportException( "Unsupported targetJdk value '" + targetJdk + "'." );
}
- pmd.setJavaVersion(sourceType);
+ pmd.setJavaVersion( sourceType );
}
return pmd;