JinParserとコーディングスタイルを統一

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index dc311b5..0b45e05 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle用チェック項目定義。
 
-    Checkstyle5.1以降向けに記述。
+    Checkstyle 5.0 以降向けに記述。
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -18,9 +18,20 @@
 <module name="Checker">
 
     <property name="charset" value="UTF-8" />
+    <property name="localeCountry" value="JP" />
+    <property name="localeLanguage" value="ja" />
     <property name="severity" value="error" />
 
 
+    <!-- Filters -->
+    <module name="SeverityMatchFilter" />
+    <module name="SuppressionFilter">
+        <property name="file" value="src/main/config/suppressions.xml" />
+    </module>
+    <module name="SuppressionCommentFilter" />
+    <module name="SuppressWithNearbyCommentFilter" />
+
+
     <!-- Duplicate Code -->
     <module name="StrictDuplicateCode">
         <property name="min" value="20" />
@@ -59,17 +70,9 @@
     <module name="FileTabCharacter" />
 
 
-<!-- Filters
-    <module name="SeverityMatchFilter" />
-    <module name="SuppressionFilter" />
-    <module name="SuppressionCommentFilter" />
-    <module name="SuppressWithNearbyCommentFilter" />
--->
-
-
     <module name="TreeWalker">
 
-        <property name="tabWidth" value="4" />
+        <module name="FileContentsHolder" />
 
 
     <!-- Annotations -->
@@ -101,7 +104,7 @@
 <!--    <module name="DesignForExtension" />  -->
         <module name="MutableException" />
         <module name="ThrowsCount">
-            <property name="max" value="4" />
+            <property name="max" value="3" />
         </module>
 
 
@@ -151,7 +154,7 @@
         <module name="PackageDeclaration" />
         <module name="JUnitTestCase" />
         <module name="ReturnCount">
-            <property name="max" value="3" />
+            <property name="max" value="5" />
         </module>
         <module name="IllegalType" />
         <module name="DeclarationOrder" />
@@ -160,7 +163,12 @@
         <module name="DefaultComesLast" />
         <module name="MissingCtor" />
         <module name="FallThrough" />
-        <module name="MultipleStringLiterals" />
+        <module name="MultipleStringLiterals">
+            <property
+                name="ignoreStringsRegexp"
+                value="^&quot;&quot;$|^&quot;.&quot;$"
+            />
+        </module>
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />
 
@@ -212,10 +220,9 @@
         <module name="UpperEll" />
         <module name="ArrayTypeStyle" />
 <!--    <module name="FinalParameters" />  -->
-        <module name="DescendantToken" />
+<!--    <module name="DescendantToken" />  -->
 <!--
         <module name="Indentation">
-            <property name="basicOffset" value="4" />
             <property name="caseIndent" value="0" />
         </module>
 -->
@@ -232,6 +239,7 @@
             <property name="duplicateLimit" value="1" />
         </module>
 
+
     <!-- Modifiers -->
 
         <module name="ModifierOrder" />
@@ -240,7 +248,12 @@
 
     <!-- Naming Conventions -->
 
-        <module name="AbstractClassName" />
+        <module name="AbstractClassName">
+            <property
+                name="format"
+                value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
+            />
+        </module>
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="LocalFinalVariableName">
@@ -258,9 +271,7 @@
         <module name="ParameterName">
             <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
         </module>
-        <module name="StaticVariableName">
-            <property name="format" value="^[a-z][_a-zA-Z0-9]*$" />
-        </module>
+        <module name="StaticVariableName" />
         <module name="TypeName" />
 
 
@@ -282,7 +293,10 @@
         <module name="EmptyForInitializerPad" />
         <module name="EmptyForIteratorPad" />
         <module name="MethodParamPad">
-            <property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL" />
+            <property
+                name="tokens"
+                value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
+            />
         </module>
         <module name="NoWhitespaceAfter">
             <property name="allowLineBreaks" value="false" />
@@ -319,7 +333,10 @@
         </module>
         <module name="ParenPad">
             <property name="option" value="nospace" />
-            <property name="tokens" value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL" />
+            <property
+                name="tokens"
+                value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
+            />
         </module>
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter">
@@ -335,7 +352,8 @@
                        SL, SR,
                        SL_ASSIGN, SR_ASSIGN,
                        MINUS, STAR, DIV, MOD,
-                       PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
+                       PLUS_ASSIGN, MINUS_ASSIGN,
+                       STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
                        EQUAL, NOT_EQUAL, GT, GE, LT, LE,
                        "
             />
@@ -352,12 +370,23 @@
 <!-- バグ？
         <module name="RequireThis" />
 -->
+<!-- 5.2 or later
+        <module name="InnerTypeLast" />
+-->
+
+<!-- 5.3 or later
+        <module name="NestedForDepth" />
+        <module name="OneStatementPerLine" />
+        <module name="OuterTypeFilename" />
+        <module name="MethodCount" />
+-->
 
 <!-- Obsolated
         <module name="TabCharacter" />
 -->
 
     </module>
+
 </module>
 
 <!-- EOF -->