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/08 15:00:33 UTC

svn commit: r375966 - /struts/build/trunk/struts_checks.xml

Author: husted
Date: Wed Feb  8 06:00:32 2006
New Revision: 375966

URL: http://svn.apache.org/viewcvs?rev=375966&view=rev
Log:
Checkstyle roundup 
* To followup changes to Jalopy configuration in r375843, re-enable CURLY and Whitespace checks, but allow whitespace around braces used with array initializers.

Modified:
    struts/build/trunk/struts_checks.xml

Modified: struts/build/trunk/struts_checks.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/struts_checks.xml?rev=375966&r1=375965&r2=375966&view=diff
==============================================================================
--- struts/build/trunk/struts_checks.xml (original)
+++ struts/build/trunk/struts_checks.xml Wed Feb  8 06:00:32 2006
@@ -45,12 +45,8 @@
     - 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. 
-    
+    - Omit "ARRAY_INIT" from NoWhitespaceAfter to avoid conflict with Jalopy.
+        
 -->
 <!--
 
@@ -165,14 +161,19 @@
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
         <module name="EmptyForIteratorPad"/>
-        <!-- Disabled for Struts: module name="NoWhitespaceAfter"/ -->
+        <!-- Struts Custom begins (omit ARRAY_INIT) -->
+        <module name="NoWhitespaceAfter">
+        	<property name="tokens" 
+        	value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+        </module>
+        <!-- Struts Custom ends -->
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
-        <!-- Disabled for Struts: module name="WhitespaceAround"/ -->
+        <module name="WhitespaceAround"/>
 
 
         <!-- Modifier Checks                                    -->
@@ -185,9 +186,9 @@
         <!-- See http://checkstyle.sf.net/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
         <module name="EmptyBlock"/>
-        <!-- Disabled for Struts: module name="LeftCurly"/ -->
+        <module name="LeftCurly"/>
         <module name="NeedBraces"/>
-        <!-- Disabled for Struts: module name="RightCurly"/ -->
+        <module name="RightCurly"/>
 
 
         <!-- Checks for common coding problems               -->



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org