update JinParser to 2.101.4

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 032d910..dcfa9c0 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,9 @@
 Jindolf 変更履歴
 
 
+X.XXX.X (XXXX-XX-XX)
+    ・JinParser 2.101.4 に対応。
+
 3.302.4 (2017-04-09)
     ・F国URL修正に伴い JinCore 1.206.10 に対応。
 

diff --git a/pom.xml b/pom.xml
index fe26247..33477cf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -126,9 +126,9 @@
         </dependency>
 
         <dependency>
-            <groupId>jp.sourceforge.jindolf</groupId>
+            <groupId>jp.osdn.jindolf</groupId>
             <artifactId>jinparser</artifactId>
-            <version>1.409.5-SNAPSHOT</version>
+            <version>2.101.4</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/src/main/java/jp/sfjp/jindolf/data/Land.java b/src/main/java/jp/sfjp/jindolf/data/Land.java
index 369a5b3..ddef69c 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/data/Land.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Land.java
@@ -20,17 +20,17 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jp.osdn.jindolf.parser.HtmlAdapter;
+import jp.osdn.jindolf.parser.HtmlParseException;
+import jp.osdn.jindolf.parser.HtmlParser;
+import jp.osdn.jindolf.parser.PageType;
+import jp.osdn.jindolf.parser.SeqRange;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sourceforge.jindolf.corelib.LandDef;
 import jp.sourceforge.jindolf.corelib.LandState;
 import jp.sourceforge.jindolf.corelib.VillageState;
-import jp.sourceforge.jindolf.parser.DecodedContent;
-import jp.sourceforge.jindolf.parser.HtmlAdapter;
-import jp.sourceforge.jindolf.parser.HtmlParseException;
-import jp.sourceforge.jindolf.parser.HtmlParser;
-import jp.sourceforge.jindolf.parser.PageType;
-import jp.sourceforge.jindolf.parser.SeqRange;
 
 /**
  * いわゆる「国」。

diff --git a/src/main/java/jp/sfjp/jindolf/data/Period.java b/src/main/java/jp/sfjp/jindolf/data/Period.java
index 7134c1e..e06493d 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/data/Period.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Period.java
@@ -17,6 +17,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jp.osdn.jindolf.parser.EntityConverter;
+import jp.osdn.jindolf.parser.HtmlAdapter;
+import jp.osdn.jindolf.parser.HtmlParseException;
+import jp.osdn.jindolf.parser.HtmlParser;
+import jp.osdn.jindolf.parser.PageType;
+import jp.osdn.jindolf.parser.SeqRange;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sfjp.jindolf.util.StringUtils;
@@ -28,13 +35,6 @@ import jp.sourceforge.jindolf.corelib.SysEventType;
 import jp.sourceforge.jindolf.corelib.TalkType;
 import jp.sourceforge.jindolf.corelib.Team;
 import jp.sourceforge.jindolf.corelib.VillageState;
-import jp.sourceforge.jindolf.parser.DecodedContent;
-import jp.sourceforge.jindolf.parser.EntityConverter;
-import jp.sourceforge.jindolf.parser.HtmlAdapter;
-import jp.sourceforge.jindolf.parser.HtmlParseException;
-import jp.sourceforge.jindolf.parser.HtmlParser;
-import jp.sourceforge.jindolf.parser.PageType;
-import jp.sourceforge.jindolf.parser.SeqRange;
 
 /**
  * いわゆる「日」。

diff --git a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
index c2dd90e..d9f44a6 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
+++ b/src/main/java/jp/sfjp/jindolf/data/SysEvent.java
@@ -12,10 +12,10 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.EventFamily;
 import jp.sourceforge.jindolf.corelib.GameRole;
 import jp.sourceforge.jindolf.corelib.SysEventType;
-import jp.sourceforge.jindolf.parser.DecodedContent;
 
 /**
  * 人狼BBSシステムが生成する各種メッセージ。

diff --git a/src/main/java/jp/sfjp/jindolf/data/Village.java b/src/main/java/jp/sfjp/jindolf/data/Village.java
index 8613805..79f23c7 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/data/Village.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Village.java
@@ -18,6 +18,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jp.osdn.jindolf.parser.HtmlAdapter;
+import jp.osdn.jindolf.parser.HtmlParseException;
+import jp.osdn.jindolf.parser.HtmlParser;
+import jp.osdn.jindolf.parser.PageType;
+import jp.osdn.jindolf.parser.SeqRange;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sfjp.jindolf.util.GUIUtils;
@@ -25,12 +31,6 @@ import jp.sourceforge.jindolf.corelib.LandDef;
 import jp.sourceforge.jindolf.corelib.LandState;
 import jp.sourceforge.jindolf.corelib.PeriodType;
 import jp.sourceforge.jindolf.corelib.VillageState;
-import jp.sourceforge.jindolf.parser.DecodedContent;
-import jp.sourceforge.jindolf.parser.HtmlAdapter;
-import jp.sourceforge.jindolf.parser.HtmlParseException;
-import jp.sourceforge.jindolf.parser.HtmlParser;
-import jp.sourceforge.jindolf.parser.PageType;
-import jp.sourceforge.jindolf.parser.SeqRange;
 
 /**
  * いわゆる「村」。

diff --git a/src/main/java/jp/sfjp/jindolf/glyph/SysEventDraw.java b/src/main/java/jp/sfjp/jindolf/glyph/SysEventDraw.java
index de5c2f1..c52ed71 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/glyph/SysEventDraw.java
+++ b/src/main/java/jp/sfjp/jindolf/glyph/SysEventDraw.java
@@ -12,9 +12,9 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.io.IOException;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sfjp.jindolf.data.DialogPref;
 import jp.sfjp.jindolf.data.SysEvent;
-import jp.sourceforge.jindolf.parser.DecodedContent;
 
 /**
  * システムイベントメッセージの描画。

diff --git a/src/main/java/jp/sfjp/jindolf/net/HtmlSequence.java b/src/main/java/jp/sfjp/jindolf/net/HtmlSequence.java
index fcec02a..df23a21 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/net/HtmlSequence.java
+++ b/src/main/java/jp/sfjp/jindolf/net/HtmlSequence.java
@@ -8,7 +8,7 @@
 package jp.sfjp.jindolf.net;
 
 import java.net.URL;
-import jp.sourceforge.jindolf.parser.DecodedContent;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 
 /**
  * HTML本文。

diff --git a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
index 0c648b2..a19fff1 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
+++ b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
@@ -24,12 +24,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 import javax.imageio.ImageIO;
+import jp.osdn.jindolf.parser.content.ContentBuilder;
+import jp.osdn.jindolf.parser.content.ContentBuilderSJ;
+import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.osdn.jindolf.parser.content.SjisNotifier;
 import jp.sfjp.jindolf.data.Period;
 import jp.sfjp.jindolf.data.Village;
-import jp.sourceforge.jindolf.parser.ContentBuilder;
-import jp.sourceforge.jindolf.parser.ContentBuilderSJ;
-import jp.sourceforge.jindolf.parser.DecodedContent;
-import jp.sourceforge.jindolf.parser.SjisNotifier;
 
 /**
  * 国ごとの人狼BBSサーバとの通信を一手に引き受ける。