svn commit: r1718746 - /jmeter/trunk/checkstyle.xml

[se...@apache.org]

Author: sebb
Date: Wed Dec  9 00:04:14 2015
New Revision: 1718746

URL: http://svn.apache.org/viewvc?rev=1718746&view=rev
Log:
Allow local suppression of checkstyle warnings

Modified:
    jmeter/trunk/checkstyle.xml

Modified: jmeter/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/checkstyle.xml?rev=1718746&r1=1718745&r2=1718746&view=diff
==============================================================================
--- jmeter/trunk/checkstyle.xml (original)
+++ jmeter/trunk/checkstyle.xml Wed Dec  9 00:04:14 2015
@@ -83,6 +83,8 @@
       <property name="classes" value="java.lang.Boolean, java.lang.String"/>
     </module>
 
+    <module name="NeedBraces"/>
+
     <!-- Required for SuppressionCommentFilter below -->
     <module name="FileContentsHolder"/>
 
@@ -94,14 +96,20 @@
 -->
 
   <!-- Setup special comments to suppress specific checks from source files -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\: stop all checks"/>
-    <property name="onCommentFormat"  value="CHECKSTYLE\: resume checking"/>
+  <module name="SuppressionCommentFilter"/>
+
+  <module name="SuppressionFilter">
+    <!-- config_loc is used by Eclipse plugin -->
+    <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
   </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifier"/>
-    <property name="onCommentFormat"  value="CHECKSTYLE\: resume VisibilityModifier"/>
-    <property name="checkFormat"      value="VisibilityModifier"/>
+
+  <!-- 
+      Allow comment to suppress checkstyle for a single line
+      e.g. // CHECKSTYLE IGNORE MagicNumber
+   -->
+  <module name="SuppressWithNearbyCommentFilter">
+    <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/>
+    <property name="checkFormat" value="$1"/>
   </module>
 
 </module>