You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/07 16:27:02 UTC
svn commit: r375628 - in /struts/build/trunk: project.properties
struts_checks.xml
Author: husted
Date: Tue Feb 7 07:26:59 2006
New Revision: 375628
URL: http://svn.apache.org/viewcvs?rev=375628&view=rev
Log:
Checkstyle Issues
* Adjust checkstyle configuration to avoid unnecessary conflicts with Jalopy
Modified:
struts/build/trunk/project.properties
struts/build/trunk/struts_checks.xml
Modified: struts/build/trunk/project.properties
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.properties?rev=375628&r1=375627&r2=375628&view=diff
==============================================================================
--- struts/build/trunk/project.properties (original)
+++ struts/build/trunk/project.properties Tue Feb 7 07:26:59 2006
@@ -8,6 +8,7 @@
maven.checkstyle.properties = ${basedir}/build/struts_checks.xml
maven.checkstyle.header.file = ${basedir}/build/LICENSE.txt
+maven.checkstyle.format = jalopy
checkstyle.regexp.header=${basedir}/build/LICENSE.CheckStyle
Modified: struts/build/trunk/struts_checks.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/struts_checks.xml?rev=375628&r1=375627&r2=375628&view=diff
==============================================================================
--- struts/build/trunk/struts_checks.xml (original)
+++ struts/build/trunk/struts_checks.xml Tue Feb 7 07:26:59 2006
@@ -38,6 +38,19 @@
- Disable the FinalParameters module, since fixing those complaints
would result in backwards incompatible API changes.
+
+ - Disable the InlineConditions modules, since Struts has always used
+ this construct.
+
+ - Increase LineLength max to 120 since Jalopy is set to format lines at
+ column 80. Some lines are difficult to both indent and wrap at 80.
+
+ - Disable LeftCurly and RightCurly modules to avoid conflicts with Jalopy.
+
+ - Disable NoWhitespaceAfter module to avoid conflicts wit Jalopy.
+
+ - Disable WhitespaceAround module to avoid conflicts with Jalopy.
+
-->
<!--
@@ -141,6 +154,7 @@
<module name="FileLength"/>
<!-- Begin Custom for Struts -->
<module name="LineLength">
+ <property name="max" value="120"/>
<property name="ignorePattern" value="^ \* @version .*$"/>
</module>
<!-- End Custom for Struts -->
@@ -151,14 +165,14 @@
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter"/>
+ <!-- Disabled for Struts: module name="NoWhitespaceAfter"/ -->
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
<module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
+ <!-- Disabled for Struts: module name="WhitespaceAround"/ -->
<!-- Modifier Checks -->
@@ -171,14 +185,14 @@
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
- <module name="LeftCurly"/>
+ <!-- Disabled for Struts: module name="LeftCurly"/ -->
<module name="NeedBraces"/>
- <module name="RightCurly"/>
+ <!-- Disabled for Struts: module name="RightCurly"/ -->
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="AvoidInlineConditionals"/>
+ <!-- Disabled for Struts: module name="AvoidInlineConditionals"/ -->
<module name="DoubleCheckedLocking"/>
<!-- MY FAVOURITE -->
<module name="EmptyStatement"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org