modify space rules

diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index b70b7fe..dcb855d 100644 (file)
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -27,6 +27,9 @@
     <!-- Imports -->
     <suppress files="" checks="ImportControl" />
 
+    <!-- Javadoc Comments -->
+    <suppress files="" checks="SummaryJavadocCheck" />
+
     <!-- Miscellaneous -->
     <suppress files="" checks="FinalParameters" />
     <suppress files="" checks="TrailingComment" />

diff --git a/checkstyle.xml b/checkstyle.xml
index 951ea00..dbf68d3 100644 (file)
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -322,13 +322,33 @@
             />
         </module>
         <module name="GenericWhitespace" />
-        <module name="MethodParamPad" />
+        <module name="MethodParamPad">
+            <property
+                name="tokens"
+                value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
+            />
+        </module>
         <module name="NoLineWrap" />
-        <module name="NoWhitespaceAfter" />
-        <module name="NoWhitespaceBefore" />
+        <module name="NoWhitespaceAfter">
+            <property name="allowLineBreaks" value="false" />
+            <property name="tokens" value="INC, DEC, DOT" />
+        </module>
+        <module name="NoWhitespaceBefore">
+            <property name="allowLineBreaks" value="false" />
+            <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
+        </module>
         <module name="OperatorWrap" />
-        <module name="ParenPad" />
-        <module name="SeparatorWrap" />
+        <module name="ParenPad">
+            <property name="option" value="nospace" />
+            <property
+                name="tokens"
+                value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
+            />
+        </module>
+        <module name="SeparatorWrap">
+            <property name="tokens" value="DOT" />
+            <property name="option" value="nl" />
+        </module>
         <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" >

diff --git a/pmdrules.xml b/pmdrules.xml
index a5daf84..09e1d3e 100644 (file)
--- a/pmdrules.xml
+++ b/pmdrules.xml
@@ -32,7 +32,9 @@
 
     <rule ref="rulesets/java/codesize.xml" />
 
-    <rule ref="rulesets/java/comments.xml" />
+    <rule ref="rulesets/java/comments.xml">
+        <exclude name="CommentDefaultAccessModifier" />
+    </rule>
     <rule ref="rulesets/java/comments.xml/CommentRequired" >
         <properties>
             <property name="fieldCommentRequirement" value="Ignored"/>
@@ -45,6 +47,7 @@
     </rule>
 
     <rule ref="rulesets/java/controversial.xml">
+        <exclude name="DefaultPackage" />
         <exclude name="OnlyOneReturn" />
         <exclude name="DataflowAnomalyAnalysis" />
         <exclude name="AvoidLiteralsInIfCondition" />
@@ -91,7 +94,9 @@
 
     <rule ref="rulesets/java/strictexception.xml" />
 
-    <rule ref="rulesets/java/strings.xml" />
+    <rule ref="rulesets/java/strings.xml">
+        <exclude name="ConsecutiveAppendsShouldReuse" />
+    </rule>
 
     <rule ref="rulesets/java/sunsecure.xml" />