From b70ca665fa605c4bcbace29d3386e61e46907d47 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Thu, 28 Apr 2011 16:46:00 +0900
Subject: [PATCH] =?utf8?q?=E9=87=8D=E8=A4=87=E6=96=87=E5=AD=97=E5=88=97?=
 =?utf8?q?=E3=81=AE=E6=8E=92=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main/config/checks.xml                           | 20 +++++++++++++++-----
 src/main/config/suppressions.xml                     |  8 ++++++++
 .../jp/sourceforge/jindolf/corelib/DateUtils.java    | 18 ++++++++++--------
 .../jp/sourceforge/jindolf/corelib/DomUtils.java     |  2 +-
 .../sourceforge/jindolf/corelib/DateUtilsTest.java   |  1 -
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index 92f7461..92e538d 100644
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -7,7 +7,7 @@
 <!--
     Checkstyle用チェック項目定義。
 
-    Checkstyle5.1以降向けに記述。
+    Checkstyle 5.0 以降向けに記述。
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -166,7 +166,10 @@
         <module name="MissingCtor" />
         <module name="FallThrough" />
         <module name="MultipleStringLiterals">
-            <property name="ignoreStringsRegexp" value="^&quot;&quot;$|." />
+            <property
+                name="ignoreStringsRegexp"
+                value="^&quot;&quot;$|^&quot;.&quot;$"
+            />
         </module>
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />
@@ -279,7 +282,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" />
@@ -316,7 +322,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">
@@ -332,7 +341,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,
                        "
             />
diff --git a/src/main/config/suppressions.xml b/src/main/config/suppressions.xml
index ef3e3ac..dba1b98 100644
--- a/src/main/config/suppressions.xml
+++ b/src/main/config/suppressions.xml
@@ -5,12 +5,20 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <!--
+    Checkstyle用警告抑止設定
+    ※ SuppressionFilter モジュール用
+
+    [ http://checkstyle.sourceforge.net/ ]
+
+    Copyright(c) 2010 olyutorskii
 -->
 
+
 <suppressions>
 
     <suppress id="" files="" checks="" lines="" columns="" />
 
 </suppressions>
 
+
 <!-- EOF -->
diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/DateUtils.java b/src/main/java/jp/sourceforge/jindolf/corelib/DateUtils.java
index b2114f6..07183db 100644
--- a/src/main/java/jp/sourceforge/jindolf/corelib/DateUtils.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/DateUtils.java
@@ -1,5 +1,6 @@
 /*
- * DOM Utilities
+ * Date Utilities
+ * (ISO8601)
  *
  * License : The MIT License
  * Copyright(c) 2011 olyutorskii
@@ -19,24 +20,25 @@ import java.util.regex.Pattern;
 final class DateUtils{
 
     private static final Pattern ISO8601_PATTERN;
-
+    private static final String REG_PLUS   = "\\+";
+    private static final String REG_HYPHEN = "\\-";
 
     static{
-        String year = "([0-9][0-9][0-9][0-9])";
-        String month = "([0-1][0-9])";
-        String day = "([0-3][0-9])";
-        String hour = "([0-2][0-9])";
+        String year   = "([0-9][0-9][0-9][0-9])";
+        String month  = "([0-1][0-9])";
+        String day    = "([0-3][0-9])";
+        String hour   = "([0-2][0-9])";
         String minute = "([0-5][0-9])";
         String second = "([0-6][0-9])";
         String timezone =
                 "("+
-                    "[\\+\\-][0-2][0-9]"+
+                    "["+REG_PLUS+REG_HYPHEN+"][0-2][0-9]"+
                     "(?:"+ ":?[0-5][0-9]" +")?"+
                 "|"+
                     "Z"+
                 ")";
         String iso8601Regex =
-                year +"\\-"+ month +"\\-"+ day
+                year +REG_HYPHEN+ month +REG_HYPHEN+ day
                 +"T"+
                 hour +":"+ minute +":"+ second
                 +timezone;
diff --git a/src/main/java/jp/sourceforge/jindolf/corelib/DomUtils.java b/src/main/java/jp/sourceforge/jindolf/corelib/DomUtils.java
index 7892628..aa27398 100644
--- a/src/main/java/jp/sourceforge/jindolf/corelib/DomUtils.java
+++ b/src/main/java/jp/sourceforge/jindolf/corelib/DomUtils.java
@@ -116,7 +116,7 @@ final class DomUtils{
         }
         String result = attr.getValue();
         if(result == null){
-            throw new SAXException("no attribute[" + attrName + "]");
+            throw new SAXException("no value[" + attrName + "]");
         }
         return result;
     }
diff --git a/src/test/java/jp/sourceforge/jindolf/corelib/DateUtilsTest.java b/src/test/java/jp/sourceforge/jindolf/corelib/DateUtilsTest.java
index bb108d8..7b804a9 100644
--- a/src/test/java/jp/sourceforge/jindolf/corelib/DateUtilsTest.java
+++ b/src/test/java/jp/sourceforge/jindolf/corelib/DateUtilsTest.java
@@ -16,7 +16,6 @@ import static org.junit.Assert.*;
 
 /**
  *
- * @author shiro
  */
 public class DateUtilsTest {
 
-- 
2.11.0