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/07 15:43:28 UTC
svn commit: r1575274 - in
/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle:
AbstractCheckstyleReport.java CheckstyleAggregateReport.java
CheckstyleReport.java
Author: dennisl
Date: Fri Mar 7 14:43:27 2014
New Revision: 1575274
URL: http://svn.apache.org/r1575274
Log:
Refactoring: move common parameters to super class.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.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=1575274&r1=1575273&r2=1575274&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 Fri Mar 7 14:43:27 2014
@@ -105,6 +105,48 @@ public abstract class AbstractCheckstyle
protected List<Resource> testResources;
/**
+ * Specifies the names filter of the source files to be used for Checkstyle.
+ */
+ @Parameter( property = "checkstyle.includes", defaultValue = JAVA_FILES, required = true )
+ protected String includes;
+
+ /**
+ * Specifies the names filter of the source files to be excluded for
+ * Checkstyle.
+ */
+ @Parameter( property = "checkstyle.excludes" )
+ protected String excludes;
+
+ /**
+ * Specifies the names filter of the resource files to be used for Checkstyle.
+ * @since 2.11
+ */
+ @Parameter( property = "checkstyle.resourceIncludes", defaultValue = "**/*.properties", required = true )
+ protected String resourceIncludes;
+
+ /**
+ * Specifies the names filter of the resource files to be excluded for
+ * Checkstyle.
+ * @since 2.11
+ */
+ @Parameter( property = "checkstyle.resourceExcludes" )
+ protected String resourceExcludes;
+
+ /**
+ * Specifies whether to include the resource directories in the check.
+ * @since 2.11
+ */
+ @Parameter( property = "checkstyle.includeResources", defaultValue = "true", required = true )
+ protected boolean includeResources;
+
+ /**
+ * Specifies whether to include the test resource directories in the check.
+ * @since 2.11
+ */
+ @Parameter( property = "checkstyle.includeTestResources", defaultValue = "true", required = true )
+ protected boolean includeTestResources;
+
+ /**
* If <code>null</code>, the Checkstyle plugin will display violations on stdout.
* Otherwise, a text file will be created with the violations.
*/
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java?rev=1575274&r1=1575273&r2=1575274&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java Fri Mar 7 14:43:27 2014
@@ -39,50 +39,6 @@ import java.util.List;
public class CheckstyleAggregateReport
extends AbstractCheckstyleReport
{
-
- /**
- * Specifies the names filter of the source files to be used for Checkstyle.
- */
- @Parameter( property = "checkstyle.includes", defaultValue = JAVA_FILES, required = true )
- private String includes;
-
- /**
- * Specifies the names filter of the source files to be excluded for
- * Checkstyle.
- */
- @Parameter( property = "checkstyle.excludes" )
- private String excludes;
-
- /**
- * Specifies the names filter of the resource files to be used for Checkstyle.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.resourceIncludes", defaultValue = "**/*.properties", required = true )
- private String resourceIncludes;
-
- /**
- * Specifies the names filter of the resource files to be excluded for
- * Checkstyle.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.resourceExcludes" )
- private String resourceExcludes;
-
- /**
- * Specifies whether to include the resource directories in the check.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.includeResources", defaultValue = "true", required = true )
- private boolean includeResources;
-
- /**
- * Specifies whether to include the test resource directories in the check.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.includeTestResources", defaultValue = "true", required = true )
- private boolean includeTestResources;
-
-
/**
* <p>
* Specifies the location of the XML configuration to use.
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1575274&r1=1575273&r2=1575274&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java Fri Mar 7 14:43:27 2014
@@ -63,48 +63,6 @@ public class CheckstyleReport
}
/**
- * Specifies the names filter of the source files to be used for Checkstyle.
- */
- @Parameter( property = "checkstyle.includes", defaultValue = JAVA_FILES, required = true )
- private String includes;
-
- /**
- * Specifies the names filter of the source files to be excluded for
- * Checkstyle.
- */
- @Parameter( property = "checkstyle.excludes" )
- private String excludes;
-
- /**
- * Specifies the names filter of the source files to be used for Checkstyle.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.resourceIncludes", defaultValue = "**/*.properties", required = true )
- private String resourceIncludes;
-
- /**
- * Specifies the names filter of the source files to be excluded for
- * Checkstyle.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.resourceExcludes" )
- private String resourceExcludes;
-
- /**
- * Specifies whether to include the resource directories in the check.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.includeResources", defaultValue = "true", required = true )
- private boolean includeResources;
-
- /**
- * Specifies whether to include the test resource directories in the check.
- * @since 2.11
- */
- @Parameter( property = "checkstyle.includeTestResources", defaultValue = "true", required = true )
- private boolean includeTestResources;
-
- /**
* <p>
* Specifies the location of the XML configuration to use.
* </p>