1.408.2版リリース準備

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3c30c24..3f1f205 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,8 +4,10 @@
 JinParser 変更履歴
 
 
-X.XXX.X (20XX-XX-XX)
+1.408.2 (2012-06-20)
     ・Maven3対応。
+    ・JinCore 1.206.6 版に対応。
+    ・G国初心者村新設に対応。
 
 1.407.4 (2011-05-10)
     ・リファクタリングのみ、仕様変更無し。

diff --git a/pom.xml b/pom.xml
index a52b7e1..4b0bd22 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <groupId>jp.sourceforge.jindolf</groupId>
     <artifactId>jinparser</artifactId>
 
-    <version>1.407.5-SNAPSHOT</version>
+    <version>1.408.2</version>
 
     <packaging>jar</packaging>
     <name>JinParser</name>
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>jp.sourceforge.jindolf</groupId>
             <artifactId>jincore</artifactId>
-            <version>1.206.5-SNAPSHOT</version>
+            <version>1.206.6</version>
             <scope>compile</scope>
         </dependency>
 
@@ -128,7 +128,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.1</version>
                 <configuration>
                     <rules>
                         <requireMavenVersion>
@@ -144,7 +144,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -166,7 +166,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.1</version>
                 <configuration>
                     <source>1.5</source>  <!-- for NetBeans IDE -->
                     <target>1.5</target>
@@ -181,7 +181,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.4</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -194,7 +194,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.3</version>
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assembly/descriptor.xml</descriptor>
@@ -234,7 +234,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12</version>
                 <configuration>
                     <skipTests>false</skipTests>
                     <enableAssertions>true</enableAssertions>
@@ -244,7 +244,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.1</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <locales>ja</locales>
@@ -256,14 +256,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <!-- config from property value -->
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
@@ -275,7 +275,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.3</version> <!-- 2.4.0 has BUG-->
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -370,13 +370,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.8.1</version>
                 <configuration>
                     <skip>false</skip>
                     <notimestamp>true</notimestamp>
                     <quiet>true</quiet>
                     <show>protected</show>
-                    <stylesheet>maven</stylesheet>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -399,7 +398,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12</version>
                 <configuration>
                     <showSuccess>false</showSuccess>
                 </configuration>
@@ -424,7 +423,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.9.1</version>
                 <configuration>
                     <skip>false</skip>
                     <!-- config from property value -->
@@ -441,7 +440,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7.1</version>
                 <configuration>
                     <skip>false</skip>
                     <targetJdk>${maven.compiler.target}</targetJdk>
@@ -462,7 +461,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.3.3</version> <!-- 2.4.0 has BUG-->
                 <configuration>
                     <skip>false</skip>
                     <effort>Max</effort>

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index c21c580..cf55cf6 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -7,7 +7,7 @@
 <!--
     Checkstyle用チェック項目定義。
 
-    Checkstyle 5.3 以降向けに記述。
+    Checkstyle 5.5 以降向けに記述。
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -167,6 +167,9 @@
         <module name="FallThrough" />
         <module name="MultipleStringLiterals" />
         <module name="MultipleVariableDeclarations" />
+        <module name="RequireThis">
+            <property name="checkMethods" value="false" />
+        </module>
         <module name="UnnecessaryParentheses" />
         <module name="OneStatementPerLine" />
 
@@ -369,10 +372,6 @@
         <module name="RegexpSinglelineJava" />
 -->
 
-<!-- バグ？
-        <module name="RequireThis" />
--->
-
 <!-- Obsolated
         <module name="TabCharacter" />
 -->

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index 65d196b..a77bfcc 100644 (file)
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -3,7 +3,7 @@
 <!--
     PMD用ルールセット定義
 
-    PMD [ http://pmd.sourceforge.net/ ] 4.2.5 以降用に記述されています。
+    PMD [ http://pmd.sourceforge.net/ ] 4.3 以降用に記述されています。
 
     Copyright(c) 2010 olyutorskii
 -->
@@ -47,6 +47,7 @@
         <exclude name="DefaultPackage" />
         <exclude name="DataflowAnomalyAnalysis" />
         <exclude name="AvoidUsingShortType" />
+        <exclude name="AvoidLiteralsInIfCondition" />
     </rule>
 
     <rule ref="rulesets/coupling.xml" />

diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java b/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
index 26e9076..007bb40 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
+++ b/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
@@ -403,7 +403,15 @@ public class HtmlParser extends AbstractParser{
     }
 
     private static final Pattern O_LISTTABLE_PATTERN =
-            compile("<table\u0020class=\"list\">");
+            compile("<table\u0020class=\"list\">"
+                   +"(?:"
+                   +  "<tr>"
+                   +    "<th>村名</th>"
+                   +    "<th>Mode</th>"
+                   +    "<th>更新</th>"
+                   +    "<th>状態</th>"
+                   +  "</tr>"
+                   +")?");
     private static final Pattern ACTIVEVILLAGE =
             compile(
              "("
@@ -411,21 +419,23 @@ public class HtmlParser extends AbstractParser{
             +")|(?:"
                 +"<tr><td>"
                 +"<a\u0020href=\"([^\"]*)\">([^<]*)</a>"
-                +"\u0020<strong>\uff08"
-                    +"(?:(?:(午前)|(午後))\u0020)?"  // AMPM
-                    +"([0-9]+)"                       // 時
+                +"(?:\u0020|</td><td>(?:通常|[^<]*)</td><td>)"
+                +"<strong>"
+                    +"(?:\uff08(?:(午前)|(午後))\u0020)?"  // AMPM
+                    +"([0-9]+)"                              // 時
                     +"(?:時\u0020|\\:)"
-                    +"([0-9]+)"                       // 分
-                    +"分?\u0020更新"
-                +"\uff09</strong>"
-                +"</td><td>(?:"
-                +"[^<]*"
-                    + "(参加者募集中です。)"
-                    +"|(開始待ちです。)"
-                    +"|(進行中です。)"
-                    +"|(勝敗が決定しました。)"
+                    +"([0-9]+)"                              // 分
+                    +"(?:\u0020|分\u0020更新\uff09)"
+                +"</strong>"
+                +"</td><td>"
+                +"(?:"
+                    + "(参加者募集中(?:です。)?)"
+                    +"|(開始待ち(?:です。)?)"
+                    +"|(進行中(?:です。)?)"
+                    +"|(勝敗が決定しました。|エピローグ)"
                     +"|(終了・ログ公開中。)"
-                +")</td></tr>"
+                +")"
+                +"</td></tr>"
             +")"
             );
 
@@ -441,6 +451,7 @@ public class HtmlParser extends AbstractParser{
 
         if( ! findProbe(O_LISTTABLE_PATTERN) ) return;
         shrinkRegion();
+        sweepSpace();
 
         for(;;){
             lookingAtAffirm(ACTIVEVILLAGE);