X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fcheckstyle%2Fcheckstyle.xml;h=17946f781e29b0d9ffdd2d5eeb1b9923b022a88e;hb=4bbd068738ed2e685f580ea1b65a7b11e32d3f3e;hp=8a5f14f04e175c89cbd10cd5e559ce8d0253b9ea;hpb=ddd696878955d609d942c4173dd66a0da9572741;p=jalview.git

diff --git a/utils/checkstyle/checkstyle.xml b/utils/checkstyle/checkstyle.xml
index 8a5f14f..17946f7 100644
--- a/utils/checkstyle/checkstyle.xml
+++ b/utils/checkstyle/checkstyle.xml
@@ -16,18 +16,6 @@
 	</module>
 
 	<!-- 
-		Allow suppression of rules by comments, e.g.:
-		// CHECKSTYLE.OFF: ParameterNumber
-		..method declaration
-		// CHECKSTYLE.ON: ParameterNumber
-	-->
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-		<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-		<property name="checkFormat" value="$1"/>
-	</module>
-
-	<!-- 
 		Check language bundles have the same keys and no duplicates
 		(ensure Checkstyle is configured to scan non-source files)
 	 -->
@@ -54,10 +42,16 @@
 		<property name="tabWidth" value="4"/>
 
 		<!-- 
-			Enables parsing of suppressions comments
-			see http://checkstyle.sourceforge.net/config_filters.html#SuppressionCommentFilter 
+			Allow suppression of rules by comments, e.g.:
+			// CHECKSTYLE.OFF: ParameterNumber
+			..method declaration
+			// CHECKSTYLE.ON: ParameterNumber
 		-->
-		<module name="FileContentsHolder"/>
+		<module name="SuppressionCommentFilter">
+			<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+			<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+			<property name="checkFormat" value="$1"/>
+		</module>
 
 	<!-- ****************************** -->
 	<!--         NAMING STANDARDS       -->
@@ -594,7 +588,13 @@
 			Check for TODO and similar comments 
 	 	-->
 		<module name="TodoComment">
-			<property name="format" value="(TODO)|(FIXME)|(DOCUMENT ME)"/>
+			<property name="format" value="(TODO)|(FIXME)"/>
+			<message key="todo.match" value="TODO or FIXME comment"/>
+		</module>
+
+		<module name="TodoComment">
+			<property name="format" value="DOCUMENT ME"/>
+			<message key="todo.match" value="Documentation incomplete"/>
 		</module>
 
 	</module>