modify pmd & checkstyle rules.

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index e5b583f..8080bd3 100644 (file)
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -339,33 +339,13 @@
             />
         </module>
         <module name="GenericWhitespace" />
-        <module name="MethodParamPad">
-            <property
-                name="tokens"
-                value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
-            />
-        </module>
+        <module name="MethodParamPad" />
         <module name="NoLineWrap" />
-        <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="NoWhitespaceAfter" />
+        <module name="NoWhitespaceBefore" />
         <module name="OperatorWrap" />
-        <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="ParenPad" />
+        <module name="SeparatorWrap" />
         <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" >

diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml
index ccc7751..db56675 100644 (file)
--- a/config/pmd/pmdrules.xml
+++ b/config/pmd/pmdrules.xml
@@ -39,8 +39,6 @@
     </rule>
 
     <rule ref="category/java/design.xml" >
-        <exclude name="AvoidThrowingNullPointerException" />
-        <exclude name="AvoidUncheckedExceptionsInSignatures" />
         <exclude name="LawOfDemeter" />
         <exclude name="LoosePackageCoupling" />
     </rule>