CoreDataAccessorのインターフェイスを変更

diff --git a/KCD/BookmarkListViewController.swift b/KCD/BookmarkListViewController.swift
index 892b878..9646f9f 100644 (file)
--- a/KCD/BookmarkListViewController.swift
+++ b/KCD/BookmarkListViewController.swift
@@ -162,7 +162,7 @@ extension BookmarkListViewController: NSTableViewDelegate, NSTableViewDataSource
             guard let data = $0.element.data(forType: DragingType.bookmarkItem),
                 let uri = NSKeyedUnarchiver.unarchiveObject(with: data) as? URL,
                 let oID = managedObjectContext.persistentStoreCoordinator?.managedObjectID(forURIRepresentation: uri),
-                let bookmark = store.object(with: oID) as? Bookmark
+                let bookmark = store.object(of: Bookmark.entity, with: oID)
                 else { return }
             
             bookmark.order = targetOrder + $0.offset + 1

diff --git a/KCD/CoreDataCore.swift b/KCD/CoreDataCore.swift
index 9de5778..80ce80d 100644 (file)
--- a/KCD/CoreDataCore.swift
+++ b/KCD/CoreDataCore.swift
@@ -92,8 +92,10 @@ protocol CoreDataAccessor: CoreDataProvider {
     
     func insertNewObject<T>(for entity: Entity<T>) -> T?
     func delete(_ object: NSManagedObject)
+    func object<T>(of entity: Entity<T>, with objectId: NSManagedObjectID) -> T?
+    func objects<T>(of entity: Entity<T>, sortDescriptors: [NSSortDescriptor]?, predicate: NSPredicate?) throws -> [T]
+    
     func object(with objectId: NSManagedObjectID) -> NSManagedObject
-    func objects<T>(with entity: Entity<T>, sortDescriptors: [NSSortDescriptor]?, predicate: NSPredicate?) throws -> [T]
 }
 
 protocol CoreDataManager {
@@ -185,12 +187,12 @@ extension CoreDataAccessor {
         context.delete(object)
     }
     
-    func object(with objectId: NSManagedObjectID) -> NSManagedObject {
+    func object<T>(of entity: Entity<T>, with objectId: NSManagedObjectID) -> T? {
         
-        return context.object(with: objectId)
+        return context.object(with: objectId) as? T
     }
     
-    func objects<T>(with entity: Entity<T>, sortDescriptors: [NSSortDescriptor]? = nil, predicate: NSPredicate? = nil) throws -> [T] {
+    func objects<T>(of entity: Entity<T>, sortDescriptors: [NSSortDescriptor]? = nil, predicate: NSPredicate? = nil) throws -> [T] {
         
         let req = NSFetchRequest<T>(entityName: entity.name)
         req.sortDescriptors = sortDescriptors
@@ -198,4 +200,9 @@ extension CoreDataAccessor {
         
         return try context.fetch(req)
     }
+    
+    func object(with objectId: NSManagedObjectID) -> NSManagedObject {
+        
+        return context.object(with: objectId)
+    }
 }

diff --git a/KCD/HistoryTableViewController.swift b/KCD/HistoryTableViewController.swift
index 07f3368..106f1c9 100644 (file)
--- a/KCD/HistoryTableViewController.swift
+++ b/KCD/HistoryTableViewController.swift
@@ -52,7 +52,10 @@ class HistoryTableViewController: NSViewController {
         
         let selectedIndex = controller.selectionIndex
         selection
-            .forEach { store.delete(store.object(with: $0.objectID)) }
+            .lazy
+            .map { $0.objectID }
+            .map { store.object(with: $0) }
+            .forEach(store.delete)
         
         if selectedIndex > 1 {
             
@@ -129,7 +132,7 @@ final class KaihatsuHistoryTableViewController: HistoryTableViewController {
     override var predicateFormat: String { return "name contains $value" }
     override func objects(of predicate: NSPredicate?, in store: LocalDataStore) throws -> [NSManagedObject] {
         
-        return try store.objects(with: KaihatuHistory.entity, predicate: predicate)
+        return try store.objects(of: KaihatuHistory.entity, predicate: predicate)
     }
 }
 
@@ -138,7 +141,7 @@ final class KenzoHistoryTableViewController: HistoryTableViewController {
     override var predicateFormat: String { return "name contains $value" }
     override func objects(of predicate: NSPredicate?, in store: LocalDataStore) throws -> [NSManagedObject] {
         
-        return try store.objects(with: KenzoHistory.entity, predicate: predicate)
+        return try store.objects(of: KenzoHistory.entity, predicate: predicate)
     }
 }
 
@@ -147,6 +150,6 @@ final class DropShipHistoryTableViewController: HistoryTableViewController {
     override var predicateFormat: String { return "shipName contains $value" }
     override func objects(of predicate: NSPredicate?, in store: LocalDataStore) throws -> [NSManagedObject] {
         
-        return try store.objects(with: DropShipHistory.entity, predicate: predicate)
+        return try store.objects(of: DropShipHistory.entity, predicate: predicate)
     }
 }

diff --git a/KCD/JSONMapper.swift b/KCD/JSONMapper.swift
index f0f7a9a..e865ccd 100644 (file)
--- a/KCD/JSONMapper.swift
+++ b/KCD/JSONMapper.swift
@@ -156,7 +156,7 @@ extension JSONMapper {
         
         let store = configuration.editorStore
         
-        guard let objects = try? store.objects(with: configuration.entity, sortDescriptors: sortDescriptors)
+        guard let objects = try? store.objects(of: configuration.entity, sortDescriptors: sortDescriptors)
             else { return print("Can not get entity named \(configuration.entity.name)") }
         
         let list = (data.type == .array ? data.arrayValue : [data])

diff --git a/KCD/LocalDataStore.swift b/KCD/LocalDataStore.swift
index 5fafea1..fa58cfe 100644 (file)
--- a/KCD/LocalDataStore.swift
+++ b/KCD/LocalDataStore.swift
@@ -47,7 +47,7 @@ extension LocalDataStore {
         let predicate03 = NSPredicate(format: "mapArea IN %@", ["1", "2", "3", "4", "5", "6", "7", "8", "9"])
         let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate01, predicate02, predicate03])
         
-        guard let dropHistories = try? objects(with: DropShipHistory.entity, predicate: predicate)
+        guard let dropHistories = try? objects(of: DropShipHistory.entity, predicate: predicate)
             else { return [] }
         
         return dropHistories
@@ -60,7 +60,7 @@ extension LocalDataStore {
     
     func kaihatuHistories() -> [KaihatuHistory] {
         
-        guard let kaihatuHistories = try? objects(with: KaihatuHistory.entity)
+        guard let kaihatuHistories = try? objects(of: KaihatuHistory.entity)
             else { return [] }
         
         return kaihatuHistories
@@ -73,7 +73,7 @@ extension LocalDataStore {
         let predicate02 = NSPredicate(format: "mark = 0 || mark = nil")
         let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate01, predicate02])
         
-        guard let kaihatuHistories = try? objects(with: KaihatuHistory.entity, predicate: predicate)
+        guard let kaihatuHistories = try? objects(of: KaihatuHistory.entity, predicate: predicate)
             else { return [] }
         
         return kaihatuHistories
@@ -88,7 +88,7 @@ extension LocalDataStore {
         
         let predicate = NSPredicate(format: "kDockId = %ld", dockId)
         
-        guard let kenzoMarks = try? objects(with: KenzoMark.entity, predicate: predicate)
+        guard let kenzoMarks = try? objects(of: KenzoMark.entity, predicate: predicate)
             else { return nil }
         
         return kenzoMarks.first
@@ -101,7 +101,7 @@ extension LocalDataStore {
         let predicate = NSPredicate(format: "fuel = %ld AND bull = %ld AND steel = %ld AND bauxite = %ld AND kaihatusizai = %ld AND kDockId = %ld AND created_ship_id = %ld",
                                     fuel, bull, steel, bauxite, kaihatusizai, kDockId, shipId)
         
-        guard let kenzoMarks = try? objects(with: KenzoMark.entity, predicate: predicate)
+        guard let kenzoMarks = try? objects(of: KenzoMark.entity, predicate: predicate)
             else { return nil }
         
         return kenzoMarks.first
@@ -119,7 +119,7 @@ extension LocalDataStore {
         let predicate02 = NSPredicate(format: "mark = 0 || mark = nil")
         let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate01, predicate02])
         
-        guard let kenzoHistories = try? objects(with: KenzoHistory.entity, predicate: predicate)
+        guard let kenzoHistories = try? objects(of: KenzoHistory.entity, predicate: predicate)
             else { return [] }
         
         return kenzoHistories
@@ -132,7 +132,7 @@ extension LocalDataStore {
     
     func hiddenDropShipHistories() -> [HiddenDropShipHistory] {
         
-        guard let dropShipHistories = try? objects(with: HiddenDropShipHistory.entity)
+        guard let dropShipHistories = try? objects(of: HiddenDropShipHistory.entity)
             else { return [] }
         
         return dropShipHistories

diff --git a/KCD/ManagedObjectContextGenerator.swift b/KCD/ManagedObjectContextGenerator.swift
index ffaf083..229a92a 100644 (file)
--- a/KCD/ManagedObjectContextGenerator.swift
+++ b/KCD/ManagedObjectContextGenerator.swift
@@ -19,8 +19,8 @@ func remove(name: String) {
     
     ["", "-wal", "-shm"]
         .map { name + $0 }
-        .map { ApplicationDirecrories.support.appendingPathComponent($0) }
-        .forEach { removeDataFile(at: $0) }
+        .map(ApplicationDirecrories.support.appendingPathComponent)
+        .forEach(removeDataFile)
 }
 
 func genarate(_ config: CoreDataConfiguration) throws -> (model: NSManagedObjectModel, coordinator: NSPersistentStoreCoordinator, moc: NSManagedObjectContext) {
@@ -55,8 +55,8 @@ private func removeDataFile(at url: URL) {
 private  func createModel(_ config: CoreDataConfiguration) throws -> NSManagedObjectModel {
     
     guard let modelURL = Bundle.main.url(forResource: config.modelName, withExtension: "momd"),
-        let model = NSManagedObjectModel(contentsOf: modelURL)
-        else {
+        let model = NSManagedObjectModel(contentsOf: modelURL) else {
+            
             throw CoreDataError.couldNotCreateModel
     }
     

diff --git a/KCD/MasterShipMapper.swift b/KCD/MasterShipMapper.swift
index b54d574..33c122d 100644 (file)
--- a/KCD/MasterShipMapper.swift
+++ b/KCD/MasterShipMapper.swift
@@ -50,7 +50,7 @@ final class MasterShipMapper: JSONMapper {
         guard let stype = masterSTypes.binarySearch(comparator: { $0.id ==? stypeID })
             else { return print("MasterShipMapper: Can not find MasterSType") }
         
-        guard let masterSType = configuration.editorStore.object(with: stype.objectID) as? MasterSType
+        guard let masterSType = configuration.editorStore.object(of: MasterSType.entity, with: stype.objectID)
             else { return print("MasterShipMapper: Can not convert to current moc object masterSType") }
         
         masterShip.stype = masterSType

diff --git a/KCD/ResourceHistoryDataStore.swift b/KCD/ResourceHistoryDataStore.swift
index cc6ffbf..a8fe640 100644 (file)
--- a/KCD/ResourceHistoryDataStore.swift
+++ b/KCD/ResourceHistoryDataStore.swift
@@ -43,7 +43,7 @@ extension ResourceHistoryDataStore {
         
         let p = NSPredicate(format: "minute IN %@ AND date < %@", minites, older as NSDate)
         
-        guard let resources = try? objects(with: Resource.entity, predicate: p)
+        guard let resources = try? objects(of: Resource.entity, predicate: p)
             else { return [] }
         
         return resources

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index d73e8a6..5ef8452 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -41,7 +41,7 @@ extension ServerDataStore {
     
     func airBases() -> [AirBase] {
         
-        guard let airbase = try? objects(with: AirBase.entity)
+        guard let airbase = try? objects(of: AirBase.entity)
             else { return [] }
         
         return airbase
@@ -51,7 +51,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "area_id == %ld AND rid == %ld", area, base)
         
-        guard let airBases = try? objects(with: AirBase.entity, predicate: p)
+        guard let airBases = try? objects(of: AirBase.entity, predicate: p)
             else { return nil }
         
         return airBases.first
@@ -64,7 +64,7 @@ extension ServerDataStore {
     
     func basic() -> Basic? {
         
-        guard let basics = try? objects(with: Basic.entity)
+        guard let basics = try? objects(of: Basic.entity)
             else { return nil }
         
         return basics.first
@@ -79,7 +79,7 @@ extension ServerDataStore {
         
         let sortDec = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let decks = try? objects(with: Deck.entity, sortDescriptors: [sortDec])
+        guard let decks = try? objects(of: Deck.entity, sortDescriptors: [sortDec])
             else { return [] }
         
         return decks
@@ -89,7 +89,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", id)
         
-        guard let decks = try? objects(with: Deck.entity, predicate: p)
+        guard let decks = try? objects(of: Deck.entity, predicate: p)
             else { return nil }
         
         return decks.first
@@ -99,7 +99,7 @@ extension ServerDataStore {
         
         let dockPredicate = NSPredicate(format: "id = %ld", dockId)
         
-        guard let kenzoDocks = try? objects(with: KenzoDock.entity, predicate: dockPredicate)
+        guard let kenzoDocks = try? objects(of: KenzoDock.entity, predicate: dockPredicate)
             else { return nil }
         
         return kenzoDocks.first
@@ -107,7 +107,7 @@ extension ServerDataStore {
     
     func mapArea(by id: Int) -> MasterMapArea? {
         let predicate = NSPredicate(format: "id = %ld", id)
-        guard let mapAreas = try? objects(with: MasterMapArea.entity, predicate: predicate)
+        guard let mapAreas = try? objects(of: MasterMapArea.entity, predicate: predicate)
             else { return nil }
         return mapAreas.first
     }
@@ -116,7 +116,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "maparea_id = %ld AND %K = %ld", area, "no", no)
         
-        guard let mapInfos = try? objects(with: MasterMapInfo.entity, predicate: predicate)
+        guard let mapInfos = try? objects(of: MasterMapInfo.entity, predicate: predicate)
             else { return nil }
         
         return mapInfos.first
@@ -126,7 +126,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", id)
         
-        guard let missions = try? objects(with: MasterMission.entity, predicate: p)
+        guard let missions = try? objects(of: MasterMission.entity, predicate: p)
             else { return nil }
         
         return missions.first
@@ -134,7 +134,7 @@ extension ServerDataStore {
     
     func masterShips() -> [MasterShip] {
         
-        guard let ships = try? objects(with: MasterShip.entity)
+        guard let ships = try? objects(of: MasterShip.entity)
             else { return [] }
         
         return ships
@@ -144,7 +144,7 @@ extension ServerDataStore {
         
         let sortDesc = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let ships = try? objects(with: MasterShip.entity, sortDescriptors: [sortDesc])
+        guard let ships = try? objects(of: MasterShip.entity, sortDescriptors: [sortDesc])
             else { return [] }
         
         return ships
@@ -154,7 +154,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", id)
         
-        guard let ships = try? objects(with: MasterShip.entity, predicate: p)
+        guard let ships = try? objects(of: MasterShip.entity, predicate: p)
             else { return nil }
         
         return ships.first
@@ -164,7 +164,7 @@ extension ServerDataStore {
         
         let sortDesc = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let masterSlotItems = try? objects(with: MasterSlotItem.entity, sortDescriptors: [sortDesc])
+        guard let masterSlotItems = try? objects(of: MasterSlotItem.entity, sortDescriptors: [sortDesc])
             else { return [] }
         
         return masterSlotItems
@@ -172,7 +172,7 @@ extension ServerDataStore {
     
     func masterSlotItems() -> [MasterSlotItem] {
         
-        guard let masterSlotItems = try? objects(with: MasterSlotItem.entity)
+        guard let masterSlotItems = try? objects(of: MasterSlotItem.entity)
             else { return [] }
         
         return masterSlotItems
@@ -182,7 +182,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", id)
         
-        guard let masterSlotItems = try? objects(with: MasterSlotItem.entity, predicate: p)
+        guard let masterSlotItems = try? objects(of: MasterSlotItem.entity, predicate: p)
             else { return nil }
         
         return masterSlotItems.first
@@ -192,7 +192,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id = %ld", id)
         
-        guard let types = try? objects(with: MasterSlotItemEquipType.entity, predicate: predicate)
+        guard let types = try? objects(of: MasterSlotItemEquipType.entity, predicate: predicate)
             else { return nil }
         
         return types.first
@@ -200,7 +200,7 @@ extension ServerDataStore {
     
     func masterSTypes() -> [MasterSType] {
         
-        guard let masterSTypes = try? objects(with: MasterSType.entity)
+        guard let masterSTypes = try? objects(of: MasterSType.entity)
             else { return [] }
         
         return masterSTypes
@@ -210,7 +210,7 @@ extension ServerDataStore {
         
         let sortDesc = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let masterSTypes = try? objects(with: MasterSType.entity, sortDescriptors: [sortDesc])
+        guard let masterSTypes = try? objects(of: MasterSType.entity, sortDescriptors: [sortDesc])
             else { return [] }
         
         return masterSTypes
@@ -218,7 +218,7 @@ extension ServerDataStore {
     
     func material() -> Material? {
         
-        guard let materials = try? objects(with: Material.entity)
+        guard let materials = try? objects(of: Material.entity)
             else { return nil }
         
         return materials.first
@@ -233,7 +233,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", id)
         
-        guard let ndocks = try? objects(with: NyukyoDock.entity, predicate: p)
+        guard let ndocks = try? objects(of: NyukyoDock.entity, predicate: p)
             else { return nil }
         
         return ndocks.first
@@ -243,7 +243,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id = %d", deckId)
         
-        guard let decks = try? objects(with: Deck.entity, predicate: predicate),
+        guard let decks = try? objects(of: Deck.entity, predicate: predicate),
             let deck = decks.first
             else { return [] }
         
@@ -256,7 +256,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id = %d", shipId)
         
-        guard let ships = try? objects(with: Ship.entity, predicate: predicate)
+        guard let ships = try? objects(of: Ship.entity, predicate: predicate)
             else { return nil }
         
         return ships.first
@@ -266,7 +266,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id = %d", shipId)
         
-        guard let ships = try? objects(with: Ship.entity, predicate: predicate)
+        guard let ships = try? objects(of: Ship.entity, predicate: predicate)
             else { return [] }
         
         return ships
@@ -276,7 +276,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "NOT id IN %@", shipIds)
         
-        guard let ships = try? objects(with: Ship.entity, predicate: predicate)
+        guard let ships = try? objects(of: Ship.entity, predicate: predicate)
             else { return [] }
         
         return ships
@@ -286,7 +286,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "NOT fleet = 0")
         
-        guard let ships = try? objects(with: Ship.entity, predicate: predicate)
+        guard let ships = try? objects(of: Ship.entity, predicate: predicate)
             else { return [] }
         
         return ships
@@ -303,7 +303,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id = %d", argumentArray: [slotItemId])
         
-        guard let slotItems = try? objects(with: SlotItem.entity, predicate: predicate),
+        guard let slotItems = try? objects(of: SlotItem.entity, predicate: predicate),
             let slotItem = slotItems.first
             else { return 0 }
         
@@ -314,7 +314,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "id = %ld", itemId)
         
-        guard let slotItems = try? objects(with: SlotItem.entity, predicate: p)
+        guard let slotItems = try? objects(of: SlotItem.entity, predicate: p)
             else { return nil }
         
         return slotItems.first
@@ -324,7 +324,7 @@ extension ServerDataStore {
         
         let sortDesc = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let slotItems = try? objects(with: SlotItem.entity, sortDescriptors: [sortDesc])
+        guard let slotItems = try? objects(of: SlotItem.entity, sortDescriptors: [sortDesc])
             else { return [] }
         
         return slotItems
@@ -332,7 +332,7 @@ extension ServerDataStore {
     
     func slotItems() -> [SlotItem] {
         
-        guard let slotItems = try? objects(with: SlotItem.entity)
+        guard let slotItems = try? objects(of: SlotItem.entity)
             else { return [] }
         
         return slotItems
@@ -342,7 +342,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "id IN %@", itemIds)
         
-        guard let slotItems = try? objects(with: SlotItem.entity, predicate: predicate)
+        guard let slotItems = try? objects(of: SlotItem.entity, predicate: predicate)
             else { return [] }
         
         return slotItems
@@ -352,7 +352,7 @@ extension ServerDataStore {
         
         let predicate = NSPredicate(format: "NOT id IN %@", itemIds)
         
-        guard let slotItems = try? objects(with: SlotItem.entity, predicate: predicate)
+        guard let slotItems = try? objects(of: SlotItem.entity, predicate: predicate)
             else { return [] }
         
         return slotItems
@@ -365,7 +365,7 @@ extension ServerDataStore {
     
     func quests() -> [Quest] {
         
-        guard let quests = try? objects(with: Quest.entity)
+        guard let quests = try? objects(of: Quest.entity)
             else { return [] }
         
         return quests
@@ -375,7 +375,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "%K = %ld", "no", no)
         
-        guard let quests = try? objects(with: Quest.entity, predicate: p)
+        guard let quests = try? objects(of: Quest.entity, predicate: p)
             else { return nil }
         
         return quests.first
@@ -385,7 +385,7 @@ extension ServerDataStore {
         
         let p = NSPredicate(format: "%K In %@", "no", range.map {$0})
         
-        guard let quests = try? objects(with: Quest.entity, predicate: p)
+        guard let quests = try? objects(of: Quest.entity, predicate: p)
             else { return [] }
         
         return quests
@@ -395,7 +395,7 @@ extension ServerDataStore {
         
         let sortDesc = NSSortDescriptor(key: "no", ascending: true)
         
-        guard let quests = try? objects(with: Quest.entity, sortDescriptors: [sortDesc])
+        guard let quests = try? objects(of: Quest.entity, sortDescriptors: [sortDesc])
             else { return [] }
         
         return quests

diff --git a/KCD/ShipMapper.swift b/KCD/ShipMapper.swift
index fdecaa0..fecc0f0 100644 (file)
--- a/KCD/ShipMapper.swift
+++ b/KCD/ShipMapper.swift
@@ -191,7 +191,7 @@ final class ShipMapper: JSONMapper {
         if ship.ship_id == masterId { return }
         
         guard let mShip = masterShips.binarySearch(comparator: { $0.id ==? masterId }),
-            let masterShip = store?.object(with: mShip.objectID) as? MasterShip
+            let masterShip = store?.object(of: MasterShip.entity, with: mShip.objectID)
             else { return print("Can not convert to current moc object masterShip") }
         
         ship.master_ship = masterShip
@@ -210,7 +210,7 @@ final class ShipMapper: JSONMapper {
                 if item == 0 || item == -1 { return nil }
                 
                 guard let found = self.slotItems.binarySearch(comparator: { $0.id ==? item }),
-                    let slotItem = store.object(with: found.objectID) as? SlotItem
+                    let slotItem = store.object(of: SlotItem.entity, with: found.objectID)
                     else {
                         
                         let maxV = converSlotItems.last
@@ -238,7 +238,7 @@ final class ShipMapper: JSONMapper {
             else { return }
         
         guard let found = slotItems.binarySearch(comparator: { $0.id ==? exSlotItem }),
-            let ex = store?.object(with: found.objectID) as? SlotItem
+            let ex = store?.object(of: SlotItem.entity, with: found.objectID)
             else { return print("Can not convert to current moc object") }
         
         ship.extraItem = ex

diff --git a/KCD/ShipMasterDetailWindowController.swift b/KCD/ShipMasterDetailWindowController.swift
index 61952f3..eec53b8 100644 (file)
--- a/KCD/ShipMasterDetailWindowController.swift
+++ b/KCD/ShipMasterDetailWindowController.swift
@@ -65,7 +65,7 @@ final class ShipMasterDetailWindowController: NSWindowController {
         let store = ServerDataStore.oneTimeEditor()
         
         guard let i = selectedShip?.objectID,
-            let ship = store.object(with: i) as? Ship
+            let ship = store.object(of: Ship.entity, with: i)
             else { return }
         
         ship.sally_area = sally.integerValue as NSNumber

diff --git a/KCD/TSVSupport.swift b/KCD/TSVSupport.swift
index a6edfd8..7bc5287 100644 (file)
--- a/KCD/TSVSupport.swift
+++ b/KCD/TSVSupport.swift
@@ -126,7 +126,7 @@ final class TSVSupport {
         
         let sortDesc = NSSortDescriptor(key: sortBy, ascending: true)
         
-        guard let array = try? store.objects(with: entity, sortDescriptors: [sortDesc])
+        guard let array = try? store.objects(of: entity, sortDescriptors: [sortDesc])
             else {
                 print("Can not get \(entity.name)")
                 return []
@@ -241,7 +241,7 @@ final class TSVSupport {
             
             let p = NSPredicate(format: "date = %@", argumentArray: [date])
             
-            guard let oo = try? store.objects(with: KaihatuHistory.entity, predicate: p),
+            guard let oo = try? store.objects(of: KaihatuHistory.entity, predicate: p),
                 oo.count != 0
                 else { return }
             
@@ -284,7 +284,7 @@ final class TSVSupport {
             
             let p = NSPredicate(format: "date = %@", argumentArray: [date])
             
-            guard let oo = try? store.objects(with: KenzoHistory.entity, predicate: p),
+            guard let oo = try? store.objects(of: KenzoHistory.entity, predicate: p),
                 oo.count != 0
                 else { return }
             
@@ -329,7 +329,7 @@ final class TSVSupport {
             
             let p = NSPredicate(format: "date = %@", argumentArray: [date])
             
-            guard let oo = try? store.objects(with: KenzoMark.entity, predicate: p),
+            guard let oo = try? store.objects(of: KenzoMark.entity, predicate: p),
                 oo.count != 0
                 else { return }
             
@@ -368,7 +368,7 @@ final class TSVSupport {
             
             let p = NSPredicate(format: "date = %@", argumentArray: [date])
             
-            guard let oo = try? store.objects(with: DropShipHistory.entity, predicate: p),
+            guard let oo = try? store.objects(of: DropShipHistory.entity, predicate: p),
                 oo.count != 0
                 else { return }
             

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index b5ee8f9..f0da822 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -50,7 +50,7 @@ extension TemporaryDataStore {
     
     func battles() -> [Battle] {
         
-        guard let battles = try? self.objects(with: Battle.entity)
+        guard let battles = try? self.objects(of: Battle.entity)
             else { return [] }
         
         return battles
@@ -70,7 +70,7 @@ extension TemporaryDataStore {
         
         let sortDescriptor = NSSortDescriptor(key: "id", ascending: true)
         
-        guard let damages = try? objects(with: Damage.entity, sortDescriptors: [sortDescriptor])
+        guard let damages = try? objects(of: Damage.entity, sortDescriptors: [sortDescriptor])
             else { return [] }
         
         return damages
@@ -78,7 +78,7 @@ extension TemporaryDataStore {
     
     func damages() -> [Damage] {
         
-        guard let damages = try? objects(with: Damage.entity)
+        guard let damages = try? objects(of: Damage.entity)
             else { return [] }
         
         return damages
@@ -91,7 +91,7 @@ extension TemporaryDataStore {
     
     func guardEscaped() -> [GuardEscaped] {
         
-        guard let escapeds = try? objects(with: GuardEscaped.entity)
+        guard let escapeds = try? objects(of: GuardEscaped.entity)
             else { return [] }
         
         return escapeds
@@ -101,7 +101,7 @@ extension TemporaryDataStore {
         
         let p = NSPredicate(format: "shipID = %ld AND ensured = TRUE", shipId)
         
-        guard let escapes = try? objects(with: GuardEscaped.entity, predicate: p)
+        guard let escapes = try? objects(of: GuardEscaped.entity, predicate: p)
             else { return nil }
         
         return escapes.first
@@ -111,7 +111,7 @@ extension TemporaryDataStore {
         
         let predicate = NSPredicate(format: "ensured = FALSE")
         
-        guard let escapeds = try? objects(with: GuardEscaped.entity, predicate: predicate)
+        guard let escapeds = try? objects(of: GuardEscaped.entity, predicate: predicate)
             else { return [] }
         
         return escapeds