Author: hboutemy Date: Sat Sep 13 23:38:16 2014 New Revision: 1624793 URL: http://svn.apache.org/r1624793 Log: remove copy/paste since code is now inherited through MSHARED-347
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1624793&r1=1624792&r2=1624793&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java Sat Sep 13 23:38:16 2014 @@ -34,7 +34,6 @@ import java.util.Map; import java.util.ResourceBundle; import org.apache.maven.artifact.Artifact; -import org.apache.maven.doxia.siterenderer.Renderer; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.model.Dependency; import org.apache.maven.model.Plugin; @@ -51,7 +50,6 @@ import org.apache.maven.plugin.checkstyl import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.resource.ResourceManager; @@ -175,15 +173,6 @@ public abstract class AbstractCheckstyle protected boolean skip; /** - * The output directory for the report. Note that this parameter is only - * evaluated if the goal is run directly from the command line. If the goal - * is run indirectly as part of a site generation, the output directory - * configured in Maven Site Plugin is used instead. - */ - @Parameter( defaultValue = "${project.reporting.outputDirectory}", required = true ) - private File outputDirectory; - - /** * Specifies the path and filename to save the Checkstyle output. The format * of the output file is determined by the <code>outputFileFormat</code> * parameter. @@ -398,13 +387,6 @@ public abstract class AbstractCheckstyle protected SiteTool siteTool; /** - * The Maven Project Object. - */ - @Parameter( defaultValue = "${project}", readonly = true, required = true ) - protected MavenProject project; - - - /** * The Plugin Descriptor */ @Parameter( defaultValue = "${plugin}", readonly = true, required = true ) @@ -441,11 +423,6 @@ public abstract class AbstractCheckstyle /** */ @Component - private Renderer siteRenderer; - - /** - */ - @Component protected ResourceManager locator; /** @@ -477,24 +454,6 @@ public abstract class AbstractCheckstyle } /** {@inheritDoc} */ - protected String getOutputDirectory() - { - return outputDirectory.getAbsolutePath(); - } - - /** {@inheritDoc} */ - protected MavenProject getProject() - { - return project; - } - - /** {@inheritDoc} */ - protected Renderer getSiteRenderer() - { - return siteRenderer; - } - - /** {@inheritDoc} */ public void executeReport( Locale locale ) throws MavenReportException { @@ -766,13 +725,6 @@ public abstract class AbstractCheckstyle return ResourceBundle.getBundle( "checkstyle-report", locale, AbstractCheckstyleReport.class.getClassLoader() ); } - /** {@inheritDoc} */ - public void setReportOutputDirectory( File reportOutputDirectory ) - { - super.setReportOutputDirectory( reportOutputDirectory ); - this.outputDirectory = reportOutputDirectory; - } - protected List<File> getSourceDirectories() { List<File> sourceDirs = null;