diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java index 4ab9e052..d5f01ead 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java @@ -58,7 +58,6 @@ import org.codehaus.plexus.resource.ResourceManager; import org.codehaus.plexus.resource.loader.FileResourceLoader; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.PathTool; /** * Base abstract class for Checkstyle reports. @@ -461,11 +460,13 @@ public abstract class AbstractCheckstyleReport extends AbstractMavenReport { protected ByteArrayOutputStream stringOutputStream; /** {@inheritDoc} */ + @Override public String getName(Locale locale) { return getI18nString(locale, "name"); } /** {@inheritDoc} */ + @Override public String getDescription(Locale locale) { return getI18nString(locale, "description"); } @@ -479,6 +480,7 @@ protected String getI18nString(Locale locale, String key) { return i18n.getString("checkstyle-report", locale, "report.checkstyle." + key); } + @Override protected MavenProject getProject() { return project; } @@ -488,6 +490,7 @@ protected List getReactorProjects() { } /** {@inheritDoc} */ + @Override public void executeReport(Locale locale) throws MavenReportException { checkDeprecatedParameterUsage(sourceDirectory, "sourceDirectory", "sourceDirectories"); checkDeprecatedParameterUsage(testSourceDirectory, "testSourceDirectory", "testSourceDirectories"); @@ -675,16 +678,6 @@ protected AuditListener getConsoleListener() throws MavenReportException { return consoleListener; } - private String determineRelativePath(File location) { - String relativePath = - PathTool.getRelativePath(getReportOutputDirectory().getAbsolutePath(), location.getAbsolutePath()); - if (relativePath == null || relativePath.trim().isEmpty()) { - relativePath = "."; - } - - return relativePath + "/" + location.getName(); - } - protected List getSourceDirectories() { if (sourceDirectories == null) { sourceDirectories = filterBuildTarget(project.getCompileSourceRoots()); diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java index 21a9802d..218fc27c 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java @@ -485,11 +485,10 @@ public class CheckstyleViolationCheckMojo extends AbstractMojo { @Parameter(property = "checkstyle.excludeGeneratedSources", defaultValue = "false") private boolean excludeGeneratedSources; - private AuditListener auditListener; - private File outputXmlFile; /** {@inheritDoc} */ + @Override public void execute() throws MojoExecutionException, MojoFailureException { checkDeprecatedParameterUsage(sourceDirectory, "sourceDirectory", "sourceDirectories"); checkDeprecatedParameterUsage(testSourceDirectory, "testSourceDirectory", "testSourceDirectories");