ShipInfoのメソッド名を少し変更する

diff --git a/KancolleSniffer/Model/ShipInfo.cs b/KancolleSniffer/Model/ShipInfo.cs
index a4fed28..36be239 100644 (file)
--- a/KancolleSniffer/Model/ShipInfo.cs
+++ b/KancolleSniffer/Model/ShipInfo.cs
@@ -84,11 +84,11 @@ namespace KancolleSniffer.Model
             }\r
             else if (url.Contains("ship2"))\r
             {\r
-                FillShipData(json.api_data, json.api_data_deck);\r
+                SetShipAndDeck(json.api_data, json.api_data_deck);\r
             }\r
             else if (url.Contains("ship3"))\r
             {\r
-                FillShipData(json.api_ship_data, json.api_deck_data);\r
+                SetShipAndDeck(json.api_ship_data, json.api_deck_data);\r
             }\r
             else if (url.Contains("ship_deck"))\r
             {\r
@@ -106,14 +106,14 @@ namespace KancolleSniffer.Model
             _shipInventory.Clear();\r
             for (var i = 0; i < FleetCount; i++)\r
                 _fleets[i].State = FleetState.Port;\r
-            FillPortShipData(json);\r
+            SetShipAndDeckForPort(json);\r
             InspectBasic(json.api_basic);\r
             if (json.api_combined_flag())\r
                 _fleets[0].CombinedType = _fleets[1].CombinedType = (CombinedType)(int)json.api_combined_flag;\r
             VerifyBattleResult();\r
         }\r
 \r
-        private void FillPortShipData(dynamic json)\r
+        private void SetShipAndDeckForPort(dynamic json)\r
         {\r
             foreach (var entry in json.api_ship)\r
             {\r
@@ -127,7 +127,7 @@ namespace KancolleSniffer.Model
 \r
         private void HandleShipDeck(dynamic json)\r
         {\r
-            FillShipDeckShipData(json);\r
+            SetShipAndDeckForShipDeck(json);\r
             VerifyBattleResult();\r
             // ドロップ艦を反映する\r
             if (DropShipId != -1)\r
@@ -139,7 +139,7 @@ namespace KancolleSniffer.Model
             }\r
         }\r
 \r
-        private void FillShipDeckShipData(dynamic json)\r
+        private void SetShipAndDeckForShipDeck(dynamic json)\r
         {\r
             foreach (var entry in json.api_ship_data)\r
             {\r
@@ -152,9 +152,9 @@ namespace KancolleSniffer.Model
             InspectDeck(json.api_deck_data);\r
         }\r
 \r
-        private void FillShipData(dynamic ship, dynamic deck)\r
+        private void SetShipAndDeck(dynamic ship, dynamic deck)\r
         {\r
-            FillShips(ship);\r
+            SetShips(ship);\r
             InspectDeck(deck); // FleetのDeckを設定した時点でShipStatusを取得するので必ずdeckが後\r
         }\r
 \r
@@ -166,7 +166,7 @@ namespace KancolleSniffer.Model
             _numEquipsChecker.MaxId = _shipInventory.MaxId;\r
         }\r
 \r
-        private void FillShips(dynamic json)\r
+        private void SetShips(dynamic json)\r
         {\r
             foreach (var entry in json)\r
                 _shipInventory.Add(CreateShipStatus(entry));\r
@@ -305,7 +305,7 @@ namespace KancolleSniffer.Model
                 return;\r
             _itemInventory.Remove(ships.SelectMany(id => _shipInventory[id].Slot));\r
             _shipInventory.Remove(ships);\r
-            FillShipData(new[] {json.api_ship}, json.api_deck);\r
+            SetShipAndDeck(new[] {json.api_ship}, json.api_deck);\r
         }\r
 \r
         public void InspectSlotExchange(dynamic json)\r
@@ -325,7 +325,7 @@ namespace KancolleSniffer.Model
 \r
         private void UpdateShips(dynamic json)\r
         {\r
-            FillShips(json);\r
+            SetShips(json);\r
             foreach (var fleet in _fleets)\r
                 fleet.SetDeck(); // ShipStatusの差し替え\r
         }\r