modify checkstyle warnings

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index a59a51d..f977ad7 100644 (file)
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -83,6 +83,8 @@
         <property name="tabWidth" value="8"/>
         <property name="fileExtensions" value="java"/>
 
+        <module name="SuppressWarningsHolder" />
+
 
     <!-- Annotations -->
 
@@ -125,7 +127,9 @@
         <module name="ArrayTrailingComma" />
         <module name="AvoidInlineConditionals" />
         <module name="CovariantEquals" />
-        <module name="DeclarationOrder" />
+        <module name="DeclarationOrder">
+            <property name="id" value="declarationorder" />
+        </module>
         <module name="DefaultComesLast" />
         <module name="EmptyStatement" />
         <module name="EqualsAvoidNull" />
@@ -173,7 +177,9 @@
         <module name="SuperClone" />
         <module name="SuperFinalize" />
         <module name="UnnecessaryParentheses" />
-        <module name="VariableDeclarationUsageDistance" />
+        <module name="VariableDeclarationUsageDistance">
+            <property name="id" value="declarationdistance" />
+        </module>
 
 
     <!-- Imports -->

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java b/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
index 587c92b..fef14ce 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
+++ b/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
@@ -15,6 +15,8 @@ import jp.sourceforge.jindolf.corelib.VillageState;
  * 人狼BBS各種XHTML文字列のパースを行いハンドラに通知する。
  */
 @SuppressWarnings({
+    "checkstyle:declarationdistance",
+    "checkstyle:declarationorder",
     "PMD.FieldDeclarationsShouldBeAtStartOfClass",
     "PMD.PrematureDeclaration"
 })

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java b/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java
index 78aa99e..3081c8f 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java
+++ b/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java
@@ -36,7 +36,7 @@ import java.nio.charset.CoderResult;
  * <p>TODO: 1.7系ランタイムによっては
  * [0x81, 0x7f]が「÷」にデコードされる場合がある問題が未解決。
  *
- * @see https://en.wikipedia.org/wiki/Shift_JIS
+ * @see <a href="https://en.wikipedia.org/wiki/Shift_JIS">Shift_JIS</a>
  * @see sun.nio.cs.ext.SJIS
  */
 public class SjisNotifier extends DecodeNotifier{

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java b/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java
index f8a7df3..6b3c802 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java
+++ b/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java
@@ -18,6 +18,8 @@ import jp.sourceforge.jindolf.corelib.Team;
  * パース進行に従い{@link SysEventHandler}の各種メソッドが呼び出される。
  */
 @SuppressWarnings({
+    "checkstyle:declarationdistance",
+    "checkstyle:declarationorder",
     "PMD.FieldDeclarationsShouldBeAtStartOfClass",
     "PMD.PrematureDeclaration"
 })

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java b/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java
index 18e0b18..1e356e9 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java
+++ b/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java
@@ -14,7 +14,11 @@ import jp.sourceforge.jindolf.corelib.TalkType;
  * 人狼BBSシステムが出力する各発言箇所のパーサ。
  * パース進行に従い{@link TalkHandler}の各種メソッドが呼び出される。
  */
-@SuppressWarnings("PMD.FieldDeclarationsShouldBeAtStartOfClass")
+@SuppressWarnings({
+    "checkstyle:declarationorder",
+    "PMD.FieldDeclarationsShouldBeAtStartOfClass",
+    "PMD.PrematureDeclaration"
+})
 public class TalkParser extends AbstractParser{
 
     private TalkHandler talkHandler;