You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/02/01 19:01:53 UTC
svn commit: r1563450 - in /maven/plugins/trunk/maven-checkstyle-plugin:
pom.xml
src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Author: michaelo
Date: Sat Feb 1 18:01:53 2014
New Revision: 1563450
URL: http://svn.apache.org/r1563450
Log:
[MCHECKSTYLE-208] Plugin generates reports incompatible with the 'maven-jxr-plugin' version 2.4
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1563450&r1=1563449&r2=1563450&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Sat Feb 1 18:01:53 2014
@@ -332,6 +332,11 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<requirements>
@@ -361,5 +366,5 @@ under the License.
</profiles>
-
+
</project>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?rev=1563450&r1=1563449&r2=1563450&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Sat Feb 1 18:01:53 2014
@@ -69,7 +69,7 @@ public class CheckstyleReportGenerator
private SiteTool siteTool;
private String xrefLocation;
-
+
private List<String> treeWalkerNames = Collections.singletonList( "TreeWalker" );
public CheckstyleReportGenerator( Sink sink, ResourceBundle bundle, File basedir, SiteTool siteTool )
@@ -780,7 +780,7 @@ public class CheckstyleReportGenerator
{
sink
.link(
- getXrefLocation() + "/" + filename.replaceAll( "\\.java$", ".html" ) + "#" + event.getLine() );
+ getXrefLocation() + "/" + filename.replaceAll( "\\.java$", ".html" ) + "#L" + event.getLine() );
}
sink.text( String.valueOf( event.getLine() ) );
if ( getXrefLocation() != null )
@@ -862,13 +862,13 @@ public class CheckstyleReportGenerator
{
this.checkstyleConfig = config;
}
-
-
+
+
public void setTreeWalkerNames( List<String> treeWalkerNames )
{
this.treeWalkerNames = treeWalkerNames;
}
-
+
public List<String> getTreeWalkerNames()
{
return treeWalkerNames;