Merge branch 'release/v4.101.6'

olyutorskii · Oct 10, 2022 · 9e93d21 · 9e93d21
2 parents a2d9f41 + 905234c
commit 9e93d21
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
-##### Git ignore pattern   https://git-scm.com/docs/gitignore
+##### Git ignore pattern
+## See https://git-scm.com/docs/gitignore
+## See https://docs.github.com/en/free-pro-team@latest/github/using-git/ignoring-files
+## See https://github.com/github/gitignore
+## See https://www.toptal.com/developers/gitignore
 
 
 ### Unix
@@ -20,7 +24,8 @@ __MACOSX
 ### Windows
 
 Thumbs.db
-desktop.ini
+[Dd]esktop.ini
+*.lnk
 
 
 ### JDK
@@ -64,4 +69,9 @@ hs_err_pid*
 *.ipr
 
 
+### Visual Studio Code
+
+/.vscode/
+
+
 ### EOF ###
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -4,6 +4,11 @@
 Jindolf 変更履歴
 
 
+4.101.6 (2022-10-10)
+    ・JinParser 2.102.6 に対応。
+    ・Jovsonz 1.101.106 に対応。
+    ・QuetexJ 1.0.8 に対応。
+
 4.101.4 (2020-10-11)
     ・G国URL変更に伴い JinParser 2.102.4 に対応。
     ・ログ出力ウィンドウをQuetexJに変更。

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -6,7 +6,7 @@
 
 <!--
     Checkstyle modules
-    for Checkstyle 8.36 or later
+    for Checkstyle 8.45 or later
 
     [ https://checkstyle.org/ ]
 
@@ -81,7 +81,7 @@
     <module name="FileLength" />
     <module name="LineLength">
         <property name="fileExtensions" value="java" />
-        <property name="max" value="78" />
+        <property name="max" value="100" />
     </module>
 
 
@@ -179,6 +179,7 @@
         <module name="IllegalType" />
         <module name="InnerAssignment" />
         <module name="MagicNumber" />
+        <module name="MatchXpath" />
         <module name="MissingCtor" />
         <module name="MissingSwitchDefault" />
         <module name="ModifiedControlVariable" />
@@ -213,6 +214,7 @@
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
         <module name="UnnecessarySemicolonInEnumeration" />
         <module name="UnnecessarySemicolonInTryWithResources" />
+        <module name="UnusedLocalVariable" />
         <module name="VariableDeclarationUsageDistance" />
 
 
@@ -235,6 +237,7 @@
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocContentLocationCheck" />
         <module name="JavadocMethod" />
+        <module name="JavadocMissingLeadingAsterisk" />
         <module name="JavadocMissingWhitespaceAfterAsterisk" />
         <module name="JavadocParagraph" />
         <module name="JavadocStyle">
@@ -319,6 +322,7 @@
         <module name="PackageName" />
         <module name="ParameterName" />
         <module name="PatternVariableName" />
+        <module name="RecordComponentName" />
         <module name="RecordTypeParameterName" />
         <module name="StaticVariableName" />
         <module name="TypeName" />
@@ -346,6 +350,7 @@
 
         <module name="AnonInnerLength" />
         <module name="ExecutableStatementCount" />
+        <module name="LambdaBodyLength" />
         <module name="MethodCount" />
         <module name="MethodLength" />
         <module name="OuterTypeNumber" />
@@ -358,19 +363,7 @@
         <module name="EmptyForInitializerPad" />
         <module name="EmptyForIteratorPad" />
         <module name="EmptyLineSeparator">
-            <property
-                name="tokens"
-                value="PACKAGE_DEF,
-                       IMPORT,
-                       CLASS_DEF,
-                       INTERFACE_DEF,
-                       ENUM_DEF,
-                       STATIC_INIT,
-                       INSTANCE_INIT,
-                       METHOD_DEF,
-                       CTOR_DEF,
-                       "
-            />
+            <property name="allowNoEmptyLineBetweenFields" value="true" />
         </module>
         <module name="GenericWhitespace" />
         <module name="MethodParamPad">
@@ -388,6 +381,7 @@
             <property name="allowLineBreaks" value="false" />
             <property name="tokens" value="COMMA, POST_INC, POST_DEC" />
         </module>
+        <module name="NoWhitespaceBeforeCaseDefaultColon" />
         <module name="OperatorWrap" />
         <module name="ParenPad">
             <property name="option" value="nospace" />
@@ -403,7 +397,7 @@
         <module name="SingleSpaceSeparator" />
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter" >
-            <property name="tokens" value="COMMA, SEMI," />
+            <property name="tokens" value="COMMA, SEMI" />
         </module>
         <module name="WhitespaceAround">
             <property
@@ -417,7 +411,7 @@
                        MINUS, STAR, DIV, MOD,
                        PLUS_ASSIGN, MINUS_ASSIGN,
                        STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
-                       EQUAL, NOT_EQUAL, GT, GE, LT, LE,
+                       EQUAL, NOT_EQUAL, GT, GE, LT, LE
                        "
             />
         </module>

diff --git a/config/pmd/pmdrules.xml b/config/pmd/pmdrules.xml
@@ -2,7 +2,7 @@
 
 <!--
     Custom rule set
-    for PMD [ https://pmd.github.io/ ] 6.21.0 or later
+    for PMD [ https://pmd.github.io/ ] 6.28.0 or later
 
     Copyright(c) 2019 olyutorskii
 -->
@@ -23,9 +23,6 @@
 
     <rule ref="category/java/codestyle.xml" >
         <exclude name="CommentDefaultAccessModifier" />
-        <exclude name="DefaultPackage" />
-        <exclude name="IfElseStmtsMustUseBraces" />
-        <exclude name="IfStmtsMustUseBraces" />
         <exclude name="LocalVariableCouldBeFinal" />
         <exclude name="MethodArgumentCouldBeFinal" />
         <exclude name="OnlyOneReturn" />
@@ -40,23 +37,12 @@
             <property name="checkSingleIfStmt" value="false"/>
         </properties>
     </rule>
-    <rule ref="category/java/codestyle.xml/ShortVariable" >
-        <properties>
-            <property name="minimum" value="2"/>
-        </properties>
-    </rule>
 
     <rule ref="category/java/design.xml" >
-        <exclude name="AvoidThrowingNullPointerException" />
         <exclude name="AvoidUncheckedExceptionsInSignatures" />
         <exclude name="LawOfDemeter" />
         <exclude name="LoosePackageCoupling" />
     </rule>
-    <rule ref="category/java/design.xml/NcssCount" >
-        <properties>
-            <property name="methodReportLevel" value="50"/>
-        </properties>
-    </rule>
 
     <rule ref="category/java/documentation.xml" />
     <rule ref="category/java/documentation.xml/CommentRequired" >
@@ -67,13 +53,13 @@
     <rule ref="category/java/documentation.xml/CommentSize" >
         <properties>
             <property name="maxLines" value="25"/>
+            <property name="maxLineLength" value="100"/>
         </properties>
     </rule>
 
     <rule ref="category/java/errorprone.xml" >
         <exclude name="AvoidLiteralsInIfCondition" />
         <exclude name="BeanMembersShouldSerialize" />
-        <exclude name="DataflowAnomalyAnalysis" />
     </rule>
 
     <rule ref="category/java/multithreading.xml" />