ラベルをswift的に修正

diff --git a/KCD/AnchorageRepairManager.swift b/KCD/AnchorageRepairManager.swift
index 8f24df1..75811f3 100644 (file)
--- a/KCD/AnchorageRepairManager.swift
+++ b/KCD/AnchorageRepairManager.swift
@@ -51,7 +51,7 @@ class AnchorageRepairManager: NSObject {
     }
     private func shipTypeId(shipId: Int) -> Int? {
         return ServerDataStore.default
-            .ship(byId: shipId)?.master_ship.stype.id
+            .ship(by: shipId)?.master_ship.stype.id
     }
     private func needsReset(info: HenseiDidChangeUserInfo) -> Bool {
         // 変更のあった艦隊の旗艦は工作艦か？

diff --git a/KCD/ApplySuppliesCommand.swift b/KCD/ApplySuppliesCommand.swift
index fce3dbd..3720213 100644 (file)
--- a/KCD/ApplySuppliesCommand.swift
+++ b/KCD/ApplySuppliesCommand.swift
@@ -14,7 +14,7 @@ class ApplySuppliesCommand: JSONCommand {
         data["api_ship"]
             .forEach { (_, json) in
                 guard let i = json["api_id"].int,
-                    let ship = store.ship(byId: i),
+                    let ship = store.ship(by: i),
                     let bull = json["api_bull"].int,
                     let fuel = json["api_fuel"].int,
                     let slots = json["api_onslot"].arrayObject as? [Int],

diff --git a/KCD/AreaNameTransformer.swift b/KCD/AreaNameTransformer.swift
index a60e7cb..09b447a 100644 (file)
--- a/KCD/AreaNameTransformer.swift
+++ b/KCD/AreaNameTransformer.swift
@@ -14,6 +14,6 @@ class AreaNameTransformer: ValueTransformer {
     }
     override func transformedValue(_ value: Any?) -> Any? {
         guard let id = value as? Int else { return nil }
-        return ServerDataStore.default.mapArea(byId: id)?.name
+        return ServerDataStore.default.mapArea(by: id)?.name
     }
 }

diff --git a/KCD/BroserWindowController.swift b/KCD/BroserWindowController.swift
index d82468b..a4c2345 100644 (file)
--- a/KCD/BroserWindowController.swift
+++ b/KCD/BroserWindowController.swift
@@ -59,7 +59,7 @@ class BroserWindowController: NSWindowController {
     }
     var flagShipID: Int = 0
     var flagShipName: String? {
-        return ServerDataStore.default.ship(byId: flagShipID)?.name
+        return ServerDataStore.default.ship(by: flagShipID)?.name
     }
     var changeMainTabHandler: ((Int) -> Void)?
     dynamic var selectedMainTabIndex: Int = 0 {

diff --git a/KCD/CalculateDamageCommand.swift b/KCD/CalculateDamageCommand.swift
index 521422e..aeb750d 100644 (file)
--- a/KCD/CalculateDamageCommand.swift
+++ b/KCD/CalculateDamageCommand.swift
@@ -96,7 +96,7 @@ class CalculateDamageCommand: JSONCommand {
             else { return print("Damages count is invalid. count is \(totalDamages.count).") }
         let aStore = ServerDataStore.oneTimeEditor()
         totalDamages.forEach {
-            guard let ship = aStore.ship(byId: $0.shipID)
+            guard let ship = aStore.ship(by: $0.shipID)
                 else { return }
             
             if ship.nowhp != $0.hp {
@@ -191,7 +191,7 @@ extension CalculateDamageCommand {
         var newHP = (hp as Int) - receicve
         if newHP <= 0 {
             let shipId = damage.shipID
-            if let ship = ServerDataStore.default.ship(byId: shipId) {
+            if let ship = ServerDataStore.default.ship(by: shipId) {
                 let efectiveHP = damageControlIfPossible(nowhp: newHP, ship: ship)
                 if efectiveHP != 0, efectiveHP != newHP {
                     damage.useDamageControl = true
@@ -417,7 +417,7 @@ extension CalculateDamageCommand {
         ship.equippedItem.forEach {
             if useDamageControl { return }
             guard let master = $0 as? SlotItem else { return }
-            let masterSlotItemId = store.masterSlotItemID(bySlotItemId: master.id)
+            let masterSlotItemId = store.masterSlotItemID(by: master.id)
             guard let type = DamageControlID(rawValue: masterSlotItemId)
                 else { return }
             switch type {
@@ -431,7 +431,7 @@ extension CalculateDamageCommand {
         }
         if useDamageControl { return nowHp }
         // check extra slot
-        let exItemId = store.masterSlotItemID(bySlotItemId: ship.slot_ex)
+        let exItemId = store.masterSlotItemID(by: ship.slot_ex)
         guard let exType = DamageControlID(rawValue: exItemId)
             else { return nowHp }
         switch exType {
@@ -450,7 +450,7 @@ extension CalculateDamageCommand {
         equiped.forEach {
             if useDamageControl { return }
             guard let master = $0 as? SlotItem else { return }
-            let masterSlotItemId = store.masterSlotItemID(bySlotItemId: master.id)
+            let masterSlotItemId = store.masterSlotItemID(by: master.id)
             guard let type = DamageControlID(rawValue: masterSlotItemId)
                 else { return }
             switch type {
@@ -469,7 +469,7 @@ extension CalculateDamageCommand {
         }
         if useDamageControl { return }
         // check extra slot
-        let exItemId = store.masterSlotItemID(bySlotItemId: ship.slot_ex)
+        let exItemId = store.masterSlotItemID(by: ship.slot_ex)
         guard let exType = DamageControlID(rawValue: exItemId)
             else { return }
         switch exType {

diff --git a/KCD/ChangeHenseiCommand.swift b/KCD/ChangeHenseiCommand.swift
index dc8025f..295673a 100644 (file)
--- a/KCD/ChangeHenseiCommand.swift
+++ b/KCD/ChangeHenseiCommand.swift
@@ -119,7 +119,7 @@ class ChangeHenseiCommand: JSONCommand {
     
     private func excludeShipsWithoutFlagShip(deckNumber: Int) {
         let store = ServerDataStore.oneTimeEditor()
-        guard let deck = store.deck(byId: deckNumber)
+        guard let deck = store.deck(by: deckNumber)
             else { return print("Deck not found") }
         (1..<6).forEach { deck.setShip(id: -1, for: $0) }
     }

diff --git a/KCD/CreateShipCommand.swift b/KCD/CreateShipCommand.swift
index 0be2470..ba99891 100644 (file)
--- a/KCD/CreateShipCommand.swift
+++ b/KCD/CreateShipCommand.swift
@@ -23,9 +23,9 @@ class CreateShipCommand: JSONCommand {
         guard let dockId = parameter["api_kdock_id"].int
             else { return print("api_kdock_id is wrong") }
         let store = ServerDataStore.default
-        guard let kenzoDock = store.kenzoDock(byDockId: dockId),
-            let flagShip = store.deck(byId: 1)
-                .flatMap({ store.ship(byId: $0.ship_0) }),
+        guard let kenzoDock = store.kenzoDock(by: dockId),
+            let flagShip = store.deck(by: 1)
+                .flatMap({ store.ship(by: $0.ship_0) }),
             let basic = store.basic()
             else { return print("CreateShipCommand: CoreData is wrong") }
         

diff --git a/KCD/DocksViewController.swift b/KCD/DocksViewController.swift
index f8fb2cf..dcb0eb5 100644 (file)
--- a/KCD/DocksViewController.swift
+++ b/KCD/DocksViewController.swift
@@ -82,7 +82,7 @@ class DocksViewController: MainTabVIewItemViewController {
     }
     var fleetName: String? {
         guard let deckId = battleContoller.value(forKeyPath: "content.deckId") as? Int else { return nil }
-        return ServerDataStore.default.deck(byId: deckId)?.name
+        return ServerDataStore.default.deck(by: deckId)?.name
     }
     var areaNumber: String? {
         let mapArea: String = {

diff --git a/KCD/DropShipHistoryCommand.swift b/KCD/DropShipHistoryCommand.swift
index 15d230e..211918e 100644 (file)
--- a/KCD/DropShipHistoryCommand.swift
+++ b/KCD/DropShipHistoryCommand.swift
@@ -25,7 +25,7 @@ class DropShipHistoryCommand: JSONCommand {
         let store = ServerDataStore.default
         guard let mapInfo = store.mapInfo(area: mapAreaId, no: battle.mapInfo)
             else { return print("KCMasterMapInfo is not found") }
-        guard let mapArea = store.mapArea(byId: mapAreaId)
+        guard let mapArea = store.mapArea(by: mapAreaId)
             else { return print("KCMasterMapArea is not found") }
         
         let localStore = LocalDataStore.oneTimeEditor()

diff --git a/KCD/DummyShipCommand.swift b/KCD/DummyShipCommand.swift
index 3640b87..7ba9429 100644 (file)
--- a/KCD/DummyShipCommand.swift
+++ b/KCD/DummyShipCommand.swift
@@ -33,7 +33,7 @@ class DummyShipCommand: JSONCommand {
     }
     private func removeDummy() {
         let store = ServerDataStore.oneTimeEditor()
-        store.ships(byId: -2).forEach { store.delete($0) }
+        store.ships(by: -2).forEach { store.delete($0) }
         DummyShipCommand.needsEnterDummy = false
     }
 }

diff --git a/KCD/FleetManager.swift b/KCD/FleetManager.swift
index 2f0f4d2..b7fe09d 100644 (file)
--- a/KCD/FleetManager.swift
+++ b/KCD/FleetManager.swift
@@ -59,7 +59,7 @@ class FleetManager: NSObject {
         // set
         fleets.enumerated().forEach { (index, fleet) in
             fleet.ships.forEach {
-                store.ship(byId: $0.id)?.fleet = (index + 1) as NSNumber
+                store.ship(by: $0.id)?.fleet = (index + 1) as NSNumber
             }
         }
     }

diff --git a/KCD/FleetViewController.swift b/KCD/FleetViewController.swift
index 776a5f2..e97dd9e 100644 (file)
--- a/KCD/FleetViewController.swift
+++ b/KCD/FleetViewController.swift
@@ -77,7 +77,7 @@ class FleetViewController: NSViewController {
     dynamic var fleetNumber: Int = 1 {
         didSet {
             ServerDataStore.default
-                .deck(byId: fleetNumber)
+                .deck(by: fleetNumber)
                 .map { fleet = $0 }
         }
     }

diff --git a/KCD/GuardShelterCommand.swift b/KCD/GuardShelterCommand.swift
index b0f2d14..c11fd82 100644 (file)
--- a/KCD/GuardShelterCommand.swift
+++ b/KCD/GuardShelterCommand.swift
@@ -43,7 +43,7 @@ class GuardShelterCommand: JSONCommand {
     }
     
     private func fleetMembers(fleetId: Int) -> [Int]? {
-        guard let deck = ServerDataStore.default.deck(byId: fleetId)
+        guard let deck = ServerDataStore.default.deck(by: fleetId)
             else { return nil }
         return [deck.ship_0, deck.ship_1, deck.ship_2,
                 deck.ship_3, deck.ship_4, deck.ship_5]

diff --git a/KCD/KaisouLockCommand.swift b/KCD/KaisouLockCommand.swift
index 140cb6a..b5d023f 100644 (file)
--- a/KCD/KaisouLockCommand.swift
+++ b/KCD/KaisouLockCommand.swift
@@ -20,6 +20,6 @@ class KaisouLockCommand: JSONCommand {
         guard let locked = data["api_locked"].int
             else { return print("api_locked is wrong") }
         let store = ServerDataStore.oneTimeEditor()
-        store.slotItem(byId: slotId)?.locked = locked != 0
+        store.slotItem(by: slotId)?.locked = locked != 0
     }
 }

diff --git a/KCD/KenzoMarkCommand.swift b/KCD/KenzoMarkCommand.swift
index 5f5d92b..a6f2be6 100644 (file)
--- a/KCD/KenzoMarkCommand.swift
+++ b/KCD/KenzoMarkCommand.swift
@@ -14,7 +14,7 @@ class KenzoMarkCommand: JSONCommand {
             else { return print("api_kdock_id is wrong") }
         
         let store = ServerDataStore.default
-        guard let kenzoDock = store.kenzoDock(byDockId: kdockId)
+        guard let kenzoDock = store.kenzoDock(by: kdockId)
             else { return print("KenzoDock is not fount") }
         let fuel = kenzoDock.item1
         let bull = kenzoDock.item2
@@ -23,7 +23,7 @@ class KenzoMarkCommand: JSONCommand {
         let kaihatu = kenzoDock.item5
         let shipId = kenzoDock.created_ship_id
         
-        guard let flagShip = store.masterShip(byId: shipId)
+        guard let flagShip = store.masterShip(by: shipId)
             else { return print("MasterShip is not found") }
         
         let localStore = LocalDataStore.oneTimeEditor()

diff --git a/KCD/NyukyoDockStatus.swift b/KCD/NyukyoDockStatus.swift
index 635c071..b5e2894 100644 (file)
--- a/KCD/NyukyoDockStatus.swift
+++ b/KCD/NyukyoDockStatus.swift
@@ -65,7 +65,7 @@ class NyukyoDockStatus: NSObject {
         guard let shipId = shipId as? Int,
             shipId != 0
             else { return }
-        guard let ship = ServerDataStore.default.ship(byId: shipId)
+        guard let ship = ServerDataStore.default.ship(by: shipId)
             else {
                 name = "Unknown"
                 DispatchQueue(label: "NyukyoDockStatus")

diff --git a/KCD/NyukyoSpeedChangeCommand.swift b/KCD/NyukyoSpeedChangeCommand.swift
index e526eac..1562a44 100644 (file)
--- a/KCD/NyukyoSpeedChangeCommand.swift
+++ b/KCD/NyukyoSpeedChangeCommand.swift
@@ -20,7 +20,7 @@ class NyukyoSpeedChangeCommand: JSONCommand {
             .flatMap { store.nyukyoDock(by: $0) }
         nDock
             .flatMap { $0.ship_id }
-            .flatMap { store.ship(byId: $0) }
+            .flatMap { store.ship(by: $0) }
             .map { $0.nowhp = $0.maxhp }
         nDock?.ship_id = 0
         nDock?.state = 0

diff --git a/KCD/NyukyoStartCommand.swift b/KCD/NyukyoStartCommand.swift
index 47c4ea0..bbfdf34 100644 (file)
--- a/KCD/NyukyoStartCommand.swift
+++ b/KCD/NyukyoStartCommand.swift
@@ -21,7 +21,7 @@ class NyukyoStartCommand: JSONCommand {
         let store = ServerDataStore.oneTimeEditor()
         parameter["api_ship_id"]
             .int
-            .flatMap { store.ship(byId: $0) }
+            .flatMap { store.ship(by: $0) }
             .map { $0.nowhp = $0.maxhp }
         
         store.material()

diff --git a/KCD/RealDestroyShipCommand.swift b/KCD/RealDestroyShipCommand.swift
index b4d1776..ea3eff4 100644 (file)
--- a/KCD/RealDestroyShipCommand.swift
+++ b/KCD/RealDestroyShipCommand.swift
@@ -13,7 +13,7 @@ class RealDestroyShipCommand: JSONCommand {
         let store = ServerDataStore.oneTimeEditor()
         parameter["api_ship_id"]
             .int
-            .flatMap { store.ship(byId: $0) }
+            .flatMap { store.ship(by: $0) }
             .flatMap { store.delete($0) }
     }
 }

diff --git a/KCD/RealPowerUpCommand.swift b/KCD/RealPowerUpCommand.swift
index 2ffe844..85c414d 100644 (file)
--- a/KCD/RealPowerUpCommand.swift
+++ b/KCD/RealPowerUpCommand.swift
@@ -15,7 +15,7 @@ class RealPowerUpCommand: JSONCommand {
             .string?
             .components(separatedBy: ",")
             .flatMap { Int($0) }
-            .flatMap { store.ship(byId: $0) }
+            .flatMap { store.ship(by: $0) }
             .forEach { store.delete($0) }
     }
 }

diff --git a/KCD/RemodelSlotItemCommand.swift b/KCD/RemodelSlotItemCommand.swift
index 990c347..81e09d6 100644 (file)
--- a/KCD/RemodelSlotItemCommand.swift
+++ b/KCD/RemodelSlotItemCommand.swift
@@ -19,7 +19,7 @@ class RemodelSlotItemCommand: JSONCommand {
         
         let afterSlot = data["api_after_slot"]
         let store = ServerDataStore.oneTimeEditor()
-        guard let slotItem = store.slotItem(byId: slotItemId)
+        guard let slotItem = store.slotItem(by: slotItemId)
             else { return print("SlotItem not found") }
 
         if let locked = afterSlot["api_locked"].int {

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index cea2e4f..094b6f3 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -63,21 +63,21 @@ extension ServerDataStore {
             else { return [] }
         return decks
     }
-    func deck(byId id: Int) -> Deck? {
+    func deck(by id: Int) -> Deck? {
         let p = NSPredicate(format: "id = %ld", id)
         guard let decks = try? objects(with: Deck.entity, predicate: p)
             else { return nil }
         return decks.first
     }
     
-    func kenzoDock(byDockId dockId: Int) -> KenzoDock? {
+    func kenzoDock(by dockId: Int) -> KenzoDock? {
         let dockPredicate = NSPredicate(format: "id = %ld", dockId)
         guard let kenzoDocks = try? objects(with: KenzoDock.entity, predicate: dockPredicate)
             else { return nil }
         return kenzoDocks.first
     }
     
-    func mapArea(byId id: Int) -> MasterMapArea? {
+    func mapArea(by id: Int) -> MasterMapArea? {
         let predicate = NSPredicate(format: "id = %ld", id)
         guard let mapAreas = try? objects(with: MasterMapArea.entity, predicate: predicate)
             else { return nil }
@@ -109,7 +109,7 @@ extension ServerDataStore {
             else { return [] }
         return ships
     }
-    func masterShip(byId id: Int) -> MasterShip? {
+    func masterShip(by id: Int) -> MasterShip? {
         let p = NSPredicate(format: "id = %ld", id)
         guard let ships = try? objects(with: MasterShip.entity, predicate: p)
             else { return nil }
@@ -176,14 +176,14 @@ extension ServerDataStore {
             else { return [] }
         return (0..<6).flatMap { deck[$0] }
     }
-    func ship(byId shipId: Int) -> Ship? {
+    func ship(by shipId: Int) -> Ship? {
         if shipId < 1 { return nil }
         let predicate = NSPredicate(format: "id = %d", shipId)
         guard let ships = try? objects(with: Ship.entity, predicate: predicate)
             else { return nil }
         return ships.first
     }
-    func ships(byId shipId: Int) -> [Ship] {
+    func ships(by shipId: Int) -> [Ship] {
         let predicate = NSPredicate(format: "id = %d", shipId)
         guard let ships = try? objects(with: Ship.entity, predicate: predicate)
             else { return [] }
@@ -205,7 +205,7 @@ extension ServerDataStore {
         return insertNewObject(for: Ship.entity)
     }
     
-    func masterSlotItemID(bySlotItemId slotItemId: Int) -> Int {
+    func masterSlotItemID(by slotItemId: Int) -> Int {
         if slotItemId < 1 { return 0 }
         let predicate = NSPredicate(format: "id = %d", argumentArray: [slotItemId])
         guard let slotItems = try? objects(with: SlotItem.entity, predicate: predicate),
@@ -214,7 +214,7 @@ extension ServerDataStore {
         return slotItem.master_slotItem.id
     }
     
-    func slotItem(byId itemId: Int) -> SlotItem? {
+    func slotItem(by itemId: Int) -> SlotItem? {
         let p = NSPredicate(format: "id = %ld", itemId)
         guard let slotItems = try? objects(with: SlotItem.entity, predicate: p)
             else { return nil }

diff --git a/KCD/Ship.swift b/KCD/Ship.swift
index d0ddb05..02f46cf 100644 (file)
--- a/KCD/Ship.swift
+++ b/KCD/Ship.swift
@@ -322,7 +322,7 @@ extension Ship {
     }
     
     private func slotItem(_ index: Int) -> SlotItem? {
-        return ServerDataStore.default.slotItem(byId: slotItemId(index))
+        return ServerDataStore.default.slotItem(by: slotItemId(index))
     }
     private func typeBonus(_ type: Int) -> [Double]? {
         switch type {

diff --git a/KCD/ShipWindowController.swift b/KCD/ShipWindowController.swift
index 5b1b12f..dbb4d55 100644 (file)
--- a/KCD/ShipWindowController.swift
+++ b/KCD/ShipWindowController.swift
@@ -21,7 +21,7 @@ class ShipWindowController: NSWindowController {
         window?.endEditing(for: nil)
         
         let store = ServerDataStore.oneTimeEditor()
-        guard let deck = store.deck(byId: missionFleetNumber),
+        guard let deck = store.deck(by: missionFleetNumber),
             let t = missionTime as? Double
             else { return }
         let time = Date(timeIntervalSinceNow: t).timeIntervalSince1970 * 1_000

diff --git a/KCD/SlotItemLevelView.swift b/KCD/SlotItemLevelView.swift
index e068120..c32cdaf 100644 (file)
--- a/KCD/SlotItemLevelView.swift
+++ b/KCD/SlotItemLevelView.swift
@@ -46,7 +46,7 @@ class SlotItemLevelView: NSTextField {
         didSet {
             slotItemController.content = nil
             guard let itemId = slotItemID as? Int else { return }
-            slotItemController.content = ServerDataStore.default.slotItem(byId: itemId)
+            slotItemController.content = ServerDataStore.default.slotItem(by: itemId)
             needsDisplay = true
         }
     }

diff --git a/KCD/SlotItemShortNameTransformer.swift b/KCD/SlotItemShortNameTransformer.swift
index b89a723..47fdc58 100644 (file)
--- a/KCD/SlotItemShortNameTransformer.swift
+++ b/KCD/SlotItemShortNameTransformer.swift
@@ -27,7 +27,7 @@ class SlotItemShortNameTransformer: ValueTransformer {
     }
     override func transformedValue(_ value: Any?) -> Any? {
         guard let id = value as? Int, id != 0, id != -1 else { return nil }
-        guard let item = ServerDataStore.default.slotItem(byId: id)
+        guard let item = ServerDataStore.default.slotItem(by: id)
             else { return nil }
         let itemId = item.master_slotItem.id
         return SlotItemShortNameTransformer.slotItemShortName[itemId] ?? item.name

diff --git a/KCD/SlotResetCommand.swift b/KCD/SlotResetCommand.swift
index 5c4d240..63d4198 100644 (file)
--- a/KCD/SlotResetCommand.swift
+++ b/KCD/SlotResetCommand.swift
@@ -18,7 +18,7 @@ class SlotResetCommand: JSONCommand {
         let store = ServerDataStore.oneTimeEditor()
         guard let ship = parameter["api_id"]
             .int
-            .flatMap({ store.ship(byId: $0) })
+            .flatMap({ store.ship(by: $0) })
             else { return print("api_id is wrong") }
         guard let slotItems = data["api_slot"].arrayObject as? [Int]
             else { return print("Can not parse api_data.api_slot") }

diff --git a/KCD/SlotitemNameTransformer.swift b/KCD/SlotitemNameTransformer.swift
index 311b5e8..c6d741a 100644 (file)
--- a/KCD/SlotitemNameTransformer.swift
+++ b/KCD/SlotitemNameTransformer.swift
@@ -14,6 +14,6 @@ class SlotitemNameTransformer: ValueTransformer {
     }
     override func transformedValue(_ value: Any?) -> Any? {
         guard let id = value as? Int, id != 0, id != -1 else { return nil }
-        return ServerDataStore.default.slotItem(byId: id)?.name
+        return ServerDataStore.default.slotItem(by: id)?.name
     }
 }

diff --git a/KCD/StoreCreateSlotItemHistoryCommand.swift b/KCD/StoreCreateSlotItemHistoryCommand.swift
index c57892e..c69ce10 100644 (file)
--- a/KCD/StoreCreateSlotItemHistoryCommand.swift
+++ b/KCD/StoreCreateSlotItemHistoryCommand.swift
@@ -22,9 +22,9 @@ class StoreCreateSlotItemHistoryCommand: JSONCommand {
         let numberOfUsedKaihatuSizai = success != 0 ? 1 : 0
         
         let store = ServerDataStore.default
-        guard let flagShip = store.deck(byId: 1)
+        guard let flagShip = store.deck(by: 1)
             .map({ $0.ship_0 })
-            .flatMap({ store.ship(byId: $0) })
+            .flatMap({ store.ship(by: $0) })
             else { return print("Flagship is not found") }
         
         guard let basic = store.basic()