From 62fa782212e23db3d6800f097d75c6494ccd3f64 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Fri, 21 Feb 2020 00:55:46 +0900
Subject: [PATCH] move HTML parsers to data.html package.

---
 src/main/java/jp/sfjp/jindolf/Controller.java          |  6 +++---
 src/main/java/jp/sfjp/jindolf/data/Period.java         |  2 +-
 src/main/java/jp/sfjp/jindolf/data/Talk.java           | 18 +++++++++---------
 src/main/java/jp/sfjp/jindolf/data/Village.java        |  1 +
 .../jp/sfjp/jindolf/data/{ => html}/PeriodHandler.java |  8 +++++++-
 .../jp/sfjp/jindolf/data/{ => html}/PeriodLoader.java  |  9 ++++++---
 .../jindolf/data/{ => html}/VillageInfoHandler.java    |  5 ++++-
 .../jindolf/data/{ => html}/VillageInfoLoader.java     |  4 +++-
 .../jindolf/data/{ => html}/VillageListHandler.java    |  2 +-
 .../jindolf/data/{ => html}/VillageListLoader.java     |  4 +++-
 .../jp/sfjp/jindolf/data/{ => html}/VillageRecord.java |  2 +-
 .../java/jp/sfjp/jindolf/data/html/package-info.java   | 15 +++++++++++++++
 12 files changed, 54 insertions(+), 22 deletions(-)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/PeriodHandler.java (99%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/PeriodLoader.java (93%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/VillageInfoHandler.java (98%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/VillageInfoLoader.java (97%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/VillageListHandler.java (99%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/VillageListLoader.java (98%)
 rename src/main/java/jp/sfjp/jindolf/data/{ => html}/VillageRecord.java (97%)
 create mode 100644 src/main/java/jp/sfjp/jindolf/data/html/package-info.java

diff --git a/src/main/java/jp/sfjp/jindolf/Controller.java b/src/main/java/jp/sfjp/jindolf/Controller.java
index a5383ed..bd2a467 100644
--- a/src/main/java/jp/sfjp/jindolf/Controller.java
+++ b/src/main/java/jp/sfjp/jindolf/Controller.java
@@ -53,12 +53,12 @@ import jp.sfjp.jindolf.data.DialogPref;
 import jp.sfjp.jindolf.data.Land;
 import jp.sfjp.jindolf.data.LandsModel;
 import jp.sfjp.jindolf.data.Period;
-import jp.sfjp.jindolf.data.PeriodLoader;
 import jp.sfjp.jindolf.data.RegexPattern;
 import jp.sfjp.jindolf.data.Talk;
 import jp.sfjp.jindolf.data.Village;
-import jp.sfjp.jindolf.data.VillageInfoLoader;
-import jp.sfjp.jindolf.data.VillageListLoader;
+import jp.sfjp.jindolf.data.html.PeriodLoader;
+import jp.sfjp.jindolf.data.html.VillageInfoLoader;
+import jp.sfjp.jindolf.data.html.VillageListLoader;
 import jp.sfjp.jindolf.dxchg.CsvExporter;
 import jp.sfjp.jindolf.dxchg.WebIPCDialog;
 import jp.sfjp.jindolf.dxchg.WolfBBS;
diff --git a/src/main/java/jp/sfjp/jindolf/data/Period.java b/src/main/java/jp/sfjp/jindolf/data/Period.java
index 1a969fd..3606bec 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Period.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Period.java
@@ -299,7 +299,7 @@ public class Period{
      * @param topic Topic
      * @throws java.lang.NullPointerException nullが渡された場合。
      */
-    protected void addTopic(Topic topic) throws NullPointerException{
+    public void addTopic(Topic topic) throws NullPointerException{
         if(topic == null) throw new NullPointerException();
         this.topicList.add(topic);
         return;
diff --git a/src/main/java/jp/sfjp/jindolf/data/Talk.java b/src/main/java/jp/sfjp/jindolf/data/Talk.java
index 42ee3e9..fe8ff46 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Talk.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Talk.java
@@ -127,7 +127,7 @@ public class Talk implements Topic{
     /**
      * 各Avatarの発言種別ごとにその日(Period)の累積発言回数を返す。
      *
-     * <p>システム生成の殺人予告の場合は負の値となる。
+     * <p>システム生成の襲撃予告の場合は負の値となる。
      *
      * @return 累積発言回数。
      */
@@ -226,7 +226,7 @@ public class Talk implements Topic{
     /**
      * 発言種別ごとの発言回数を設定する。
      *
-     * <p>システム生成の殺人予告では負の値を入れれば良い。
+     * <p>システム生成の襲撃予告では負の値を入れれば良い。
      *
      * @param count 発言回数
      */
@@ -266,21 +266,21 @@ public class Talk implements Topic{
     }
 
     /**
-     * 会話テキスト本文が殺人予告たりうるか判定する。
+     * 会話テキスト本文が襲撃予告たりうるか判定する。
      *
-     * <p>Period開始時の殺人予告の文面はシステムが生成する文書であり、
+     * <p>Period開始時の襲撃予告の文面はシステムが生成する文書であり、
      * 狼プレイヤーの投稿に由来しない。
      *
      * <p>「！ 今日がお前の命日だ！」で終わる赤ログは
-     * 殺人予告の可能性がある。
+     * 襲撃予告の可能性がある。
      *
      * <p>
-     * {@link jp.sourceforge.jindolf.corelib.SysEventType.MURDERED}
+     * {@link jp.sourceforge.jindolf.corelib.SysEventType#MURDERED}
      * もしくは
-     * {@link jp.sourceforge.jindolf.corelib.SysEventType.NOMURDER}
-     * の前に該当する赤ログが出現すれば、それは殺人予告と断定して良い。
+     * {@link jp.sourceforge.jindolf.corelib.SysEventType#NOMURDER}
+     * の前に該当する赤ログが出現すれば、それは襲撃予告と断定して良い。
      *
-     * @return 殺人予告のテキストの可能性があるならtrue
+     * @return 襲撃予告のテキストの可能性があるならtrue
      */
     public boolean isMurderNotice(){
         boolean isWolf;
diff --git a/src/main/java/jp/sfjp/jindolf/data/Village.java b/src/main/java/jp/sfjp/jindolf/data/Village.java
index 4629fdd..eef9fbc 100644
--- a/src/main/java/jp/sfjp/jindolf/data/Village.java
+++ b/src/main/java/jp/sfjp/jindolf/data/Village.java
@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import jp.sfjp.jindolf.data.html.PeriodLoader;
 import jp.sfjp.jindolf.util.GUIUtils;
 import jp.sourceforge.jindolf.corelib.LandDef;
 import jp.sourceforge.jindolf.corelib.VillageState;
diff --git a/src/main/java/jp/sfjp/jindolf/data/PeriodHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java
similarity index 99%
rename from src/main/java/jp/sfjp/jindolf/data/PeriodHandler.java
rename to src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java
index d3daf7b..ed5c677 100644
--- a/src/main/java/jp/sfjp/jindolf/data/PeriodHandler.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/PeriodHandler.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2020 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -17,6 +17,12 @@ import jp.osdn.jindolf.parser.HtmlParseException;
 import jp.osdn.jindolf.parser.PageType;
 import jp.osdn.jindolf.parser.SeqRange;
 import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.sfjp.jindolf.data.Avatar;
+import jp.sfjp.jindolf.data.Period;
+import jp.sfjp.jindolf.data.SysEvent;
+import jp.sfjp.jindolf.data.Talk;
+import jp.sfjp.jindolf.data.Topic;
+import jp.sfjp.jindolf.data.Village;
 import jp.sourceforge.jindolf.corelib.EventFamily;
 import jp.sourceforge.jindolf.corelib.GameRole;
 import jp.sourceforge.jindolf.corelib.PeriodType;
diff --git a/src/main/java/jp/sfjp/jindolf/data/PeriodLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java
similarity index 93%
rename from src/main/java/jp/sfjp/jindolf/data/PeriodLoader.java
rename to src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java
index 82ddd60..ec5dbec 100644
--- a/src/main/java/jp/sfjp/jindolf/data/PeriodLoader.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/PeriodLoader.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2020 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -13,6 +13,9 @@ import java.util.logging.Logger;
 import jp.osdn.jindolf.parser.HtmlParseException;
 import jp.osdn.jindolf.parser.HtmlParser;
 import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.sfjp.jindolf.data.Land;
+import jp.sfjp.jindolf.data.Period;
+import jp.sfjp.jindolf.data.Village;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sourceforge.jindolf.corelib.PeriodType;
@@ -74,8 +77,8 @@ public final class PeriodLoader {
                (常にFullOpen)
         */
         boolean isOpen = true;
-        if(   village.getState() == VillageState.PROGRESS
-           && period.getType() == PeriodType.PROGRESS ){
+        if(    village.getState() == VillageState.PROGRESS
+            && period.getType() == PeriodType.PROGRESS ){
             isOpen = false;
         }
         period.setFullOpen(isOpen);
diff --git a/src/main/java/jp/sfjp/jindolf/data/VillageInfoHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java
similarity index 98%
rename from src/main/java/jp/sfjp/jindolf/data/VillageInfoHandler.java
rename to src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java
index 58a1a61..d4606c2 100644
--- a/src/main/java/jp/sfjp/jindolf/data/VillageInfoHandler.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoHandler.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2020 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.util.logging.Logger;
 import jp.osdn.jindolf.parser.HtmlAdapter;
@@ -13,6 +13,9 @@ import jp.osdn.jindolf.parser.HtmlParseException;
 import jp.osdn.jindolf.parser.PageType;
 import jp.osdn.jindolf.parser.SeqRange;
 import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.sfjp.jindolf.data.Land;
+import jp.sfjp.jindolf.data.Period;
+import jp.sfjp.jindolf.data.Village;
 import jp.sourceforge.jindolf.corelib.LandDef;
 import jp.sourceforge.jindolf.corelib.LandState;
 import jp.sourceforge.jindolf.corelib.PeriodType;
diff --git a/src/main/java/jp/sfjp/jindolf/data/VillageInfoLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java
similarity index 97%
rename from src/main/java/jp/sfjp/jindolf/data/VillageInfoLoader.java
rename to src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java
index 6b41664..37f99c4 100644
--- a/src/main/java/jp/sfjp/jindolf/data/VillageInfoLoader.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageInfoLoader.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2008 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -13,6 +13,8 @@ import java.util.logging.Logger;
 import jp.osdn.jindolf.parser.HtmlParseException;
 import jp.osdn.jindolf.parser.HtmlParser;
 import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.sfjp.jindolf.data.Land;
+import jp.sfjp.jindolf.data.Village;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sourceforge.jindolf.corelib.LandDef;
diff --git a/src/main/java/jp/sfjp/jindolf/data/VillageListHandler.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java
similarity index 99%
rename from src/main/java/jp/sfjp/jindolf/data/VillageListHandler.java
rename to src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java
index b2fde42..9d75a64 100644
--- a/src/main/java/jp/sfjp/jindolf/data/VillageListHandler.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageListHandler.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2008 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/main/java/jp/sfjp/jindolf/data/VillageListLoader.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java
similarity index 98%
rename from src/main/java/jp/sfjp/jindolf/data/VillageListLoader.java
rename to src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java
index 8b419e7..ade77df 100644
--- a/src/main/java/jp/sfjp/jindolf/data/VillageListLoader.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageListLoader.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2008 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,6 +19,8 @@ import java.util.logging.Logger;
 import jp.osdn.jindolf.parser.HtmlParseException;
 import jp.osdn.jindolf.parser.HtmlParser;
 import jp.osdn.jindolf.parser.content.DecodedContent;
+import jp.sfjp.jindolf.data.Land;
+import jp.sfjp.jindolf.data.Village;
 import jp.sfjp.jindolf.net.HtmlSequence;
 import jp.sfjp.jindolf.net.ServerAccess;
 import jp.sourceforge.jindolf.corelib.LandDef;
diff --git a/src/main/java/jp/sfjp/jindolf/data/VillageRecord.java b/src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java
similarity index 97%
rename from src/main/java/jp/sfjp/jindolf/data/VillageRecord.java
rename to src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java
index e032c8f..66c9b74 100644
--- a/src/main/java/jp/sfjp/jindolf/data/VillageRecord.java
+++ b/src/main/java/jp/sfjp/jindolf/data/html/VillageRecord.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2020 olyutorskii
  */
 
-package jp.sfjp.jindolf.data;
+package jp.sfjp.jindolf.data.html;
 
 import jp.sourceforge.jindolf.corelib.VillageState;
 
diff --git a/src/main/java/jp/sfjp/jindolf/data/html/package-info.java b/src/main/java/jp/sfjp/jindolf/data/html/package-info.java
new file mode 100644
index 0000000..c67ada7
--- /dev/null
+++ b/src/main/java/jp/sfjp/jindolf/data/html/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * package info
+ *
+ * License : The MIT License
+ * Copyright(c) 2020 olyutorskii
+ */
+
+/**
+ * 人狼BBSサーバから受信したHTMLデータから、
+ * JinParserなどを用いて各種データモデルを生成するクラス群。
+ */
+
+package jp.sfjp.jindolf.data.html;
+
+/* EOF */
-- 
2.11.0