Update of /var/cvs/contributions/CMSContainer_Portlets/maven-base
In directory james.mmbase.org:/tmp/cvs-serv24010
Modified Files:
checkstyle-mmbase.xml
Log Message:
modify checkstyle rules for generic
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/maven-base
Index: checkstyle-mmbase.xml
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/maven-base/checkstyle-mmbase.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- checkstyle-mmbase.xml 7 Mar 2007 19:36:45 -0000 1.1
+++ checkstyle-mmbase.xml 14 Oct 2008 10:56:30 -0000 1.2
@@ -22,11 +22,12 @@
<!-- Javadoc comments -->
<module name="JavadocType">
<property name="authorFormat" value="\S+"/>
- <property name="versionFormat" value="\$Revision: 1.1 $|\$Id:
checkstyle-mmbase.xml,v 1.1 2007/03/07 19:36:45 nklasens Exp $"/>
+ <property name="versionFormat" value="\$Revision: 1.2 $|\$Id:
checkstyle-mmbase.xml,v 1.2 2008/10/14 10:56:30 mguo Exp $"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="protected"/>
<property name="allowUndeclaredRTE" value="true"/>
+ <property name="allowMissingPropertyJavadoc" value="true"/>
</module>
<module name="JavadocVariable">
<property name="scope" value="protected"/>
@@ -73,28 +74,68 @@
<!-- Whitespace -->
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_START -->
+ <property name="tokens" value="ARRAY_INIT, BNOT,
+DEC, DOT, INC, LNOT,
+ UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
+ </module>
+ <!-- <module name="NoWhitespaceAfter">
<property name="tokens" value="DEC, DOT, INC"/>
<property name="allowLineBreaks" value="false"/>
- </module>
+ </module> -->
<module name="NoWhitespaceBefore"/>
+
+ <module name="NoWhitespaceBefore">
+ <!-- Default tokens and additional GENERIC_START
+ and GENERIC_END -->
+ <property name="tokens" value="SEMI, POST_DEC,
+POST_INC,
+ GENERIC_START, GENERIC_END"/>
+ </module>
+ <!--
<module name="NoWhitespaceBefore">
<property name="tokens" value="POST_DEC, DOT, POST_INC"/>
<property name="allowLineBreaks" value="false"/>
- </module>
+ </module> -->
<!-- Arithmetic or shift operators may be at the end of a line -->
<module name="OperatorWrap">
- <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN,
MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, DIV,
COLON, MINUS, MOD, STAR, SL, SR"/>
+ <property name="tokens"
+ value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN,
STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, DIV, COLON, MINUS,
MOD, STAR, SL, SR"/>
<property name="option" value="eol"/>
</module>
<!-- Logical operators may NEVER be at the end of a line, except ?
(=QUESTION) -->
<module name="OperatorWrap">
- <property name="tokens" value="BAND, BOR, BSR, BXOR, BXOR_ASSIGN,
BOR_ASSIGN, BAND_ASSIGN, EQUAL, GE, GT, LE, LT, LAND, LITERAL_INSTANCEOF, LOR,
NOT_EQUAL"/>
+ <property name="tokens"
+ value="BAND, BOR, BSR, BXOR, BXOR_ASSIGN, BOR_ASSIGN,
BAND_ASSIGN, EQUAL, GE, GT, LE, LT, LAND, LITERAL_INSTANCEOF, LOR, NOT_EQUAL"/>
<property name="option" value="nl"/>
</module>
<module name="ParenPad"/>
<module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
+ <module name="WhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_END -->
+ <property name="tokens" value="COMMA, SEMI,
+TYPECAST, GENERIC_END"/>
+ </module>
+ <module name="WhitespaceAround">
+ <!-- Default tokens without GENERIC_START and
+ GENERIC_END -->
+ <property name="tokens" value="ASSIGN, BAND,
+BAND_ASSIGN, BOR,
+ BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN,
+COLON, DIV,
+ DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE,
+LITERAL_ASSERT,
+ LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
+LITERAL_FINALLY,
+ LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+LITERAL_SYNCHRONIZED,
+ LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+MINUS_ASSIGN, MOD,
+ MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN,
+QUESTION, RCURLY, SL,
+ SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,
+ TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ </module>
<!-- Modifiers -->
<!--OFF <module name="ModifierOrder"/> -->
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
