Merge branch 'develop' into topic/freeparser

[jindolf/Jindolf.git] / src / main / java / jp / sfjp / jindolf / Controller.java

diff --git a/src/main/java/jp/sfjp/jindolf/Controller.java b/src/main/java/jp/sfjp/jindolf/Controller.java
index 1d67b7e..d2e06d5 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/Controller.java
+++ b/src/main/java/jp/sfjp/jindolf/Controller.java
@@ -22,7 +22,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
 import java.util.List;
-import java.util.SortedSet;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.logging.Handler;
@@ -57,6 +56,8 @@ import jp.sfjp.jindolf.data.Period;
 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.dxchg.CsvExporter;
 import jp.sfjp.jindolf.dxchg.WebIPCDialog;
 import jp.sfjp.jindolf.dxchg.WolfBBS;
@@ -1185,9 +1186,9 @@ public class Controller
      * @param land 国
      */
     private void taskReloadVillageList(Land land){
-        SortedSet<Village> villageList;
+        List<Village> villageList;
         try{
-            villageList = land.downloadVillageList();
+            villageList = VillageListLoader.loadVillageList(land);
         }catch(IOException e){
             showNetworkError(land, e);
             return;
@@ -1258,7 +1259,7 @@ public class Controller
             private boolean updatePeriodList(){
                 updateStatusBar("村情報を読み直しています…");
                 try{
-                    Village.updateVillage(village);
+                    VillageInfoLoader.updateVillageInfo(village);
                 }catch(IOException e){
                     showNetworkError(village, e);
                     return false;
@@ -1451,7 +1452,7 @@ public class Controller
                     updateStatusBar("村情報を読み込み中…");
 
                     try{
-                        Village.updateVillage(village);
+                        VillageInfoLoader.updateVillageInfo(village);
                     }catch(IOException e){
                         showNetworkError(village, e);
                         return;