swiftlintに対応

[kcd/KCD.git] / KCD / Fleet.swift

diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index c5d3850..4532234 100644 (file)
--- a/KCD/Fleet.swift
+++ b/KCD/Fleet.swift
@@ -8,65 +8,86 @@
 
 import Cocoa
 
-fileprivate var DeckContext = 0
+private var pDeckContext = 0
 
-class Fleet: NSObject {
+final class Fleet: NSObject {
+    
     let fleetNumber: Int
+    private let deckController = NSObjectController()
+    
     private let deckObserveKeys = [
         "selection.ship_0", "selection.ship_1", "selection.ship_2",
-        "selection.ship_3", "selection.ship_4", "selection.ship_5",
-        ]
+        "selection.ship_3", "selection.ship_4", "selection.ship_5"
+    ]
     
     init?(number: Int) {
-        guard 1...4 ~= number
-            else {
-                print("Fleet number out of range")
-                return nil
+        
+        guard case 1...4 = number else {
+            
+            Logger.shared.log("Fleet number out of range")
+            return nil
         }
+        
         fleetNumber = number
-        deckController = NSObjectController()
+        
         super.init()
         
         deckController.entityName = Deck.entityName
-        deckController.managedObjectContext = ServerDataStore.default.managedObjectContext
-        deckController.fetchPredicate = NSPredicate(format: "id = %ld", number)
+        deckController.managedObjectContext = ServerDataStore.default.context
+        deckController.fetchPredicate = NSPredicate(#keyPath(Deck.id), equal: number)
         let req = NSFetchRequest<NSFetchRequestResult>()
-        req.entity = NSEntityDescription.entity(forEntityName: Deck.entityName, in: deckController.managedObjectContext!)
+        req.entity = NSEntityDescription.entity(forEntityName: Deck.entityName,
+                                                in: deckController.managedObjectContext!)
         req.predicate = deckController.fetchPredicate
+        
         do {
+            
             try deckController.fetch(with: req, merge: false)
-        }
-        catch {
-            print("Fetch error")
+            
+        } catch {
+            
+            Logger.shared.log("Fetch error")
             return nil
         }
+        
         deck = deckController.content as? Deck
-        deckObserveKeys.forEach { deckController.addObserver(self, forKeyPath: $0, context: &DeckContext) }
+        deckObserveKeys.forEach { deckController.addObserver(self, forKeyPath: $0, context: &pDeckContext) }
     }
+    
     deinit {
+        
         deckObserveKeys.forEach { deckController.removeObserver(self, forKeyPath: $0) }
     }
     
-    dynamic private(set) var ships: [Ship] = []
-    private let deckController: NSObjectController
-    private weak var deck: Deck?
-    
-    dynamic var name: String? { return deck?.name }
-    func keyPathsForValuesAffectingName() -> Set<String> {
-        return ["deck.name"]
-    }
-    dynamic var id: NSNumber? { return deck?.id as NSNumber? }
-    func keyPathesForValuesAffectiongId() -> Set<String> {
-        return ["deck.id"]
+    @objc override class func keyPathsForValuesAffectingValue(forKey key: String) -> Set<String> {
+        
+        switch key {
+            
+        case #keyPath(name): return [#keyPath(deck.name)]
+            
+        case #keyPath(id): return [#keyPath(deck.id)]
+            
+        default: return []
+        }
     }
     
+    @objc dynamic private(set) var ships: [Ship] = []
+    @objc var deck: Deck?
+    
+    @objc dynamic var name: String? { return deck?.name }
+    @objc dynamic var id: NSNumber? { return deck?.id as NSNumber? }
+    
     subscript(_ index: Int) -> Ship? { return deck?[index] }
     
-    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-        if context == &DeckContext {
-            ships = (0..<6).flatMap { return self[$0] }
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
+        
+        if context == &pDeckContext {
+            
+            ships = (0..<6).flatMap { self[$0] }
+            
             return
         }
+        
         super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
     }
 }