関数名を変更

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

diff --git a/KCD/ShipViewController.swift b/KCD/ShipViewController.swift
index 5eaef16..ec7da25 100644 (file)
--- a/KCD/ShipViewController.swift
+++ b/KCD/ShipViewController.swift
@@ -8,17 +8,20 @@
 
 import Cocoa
 
-fileprivate enum ViewType: Int {
+private enum ViewType: Int {
+    
     case exp
     case power
     case power2
     case power3
 }
 
-class ShipViewController: MainTabVIewItemViewController {
-    let managedObjectContext = ServerDataStore.default.context
+final class ShipViewController: MainTabVIewItemViewController {
+    
+    @objc let managedObjectContext = ServerDataStore.default.context
     
     deinit {
+        
         NotificationCenter.default.removeObserver(self)
     }
     
@@ -29,51 +32,76 @@ class ShipViewController: MainTabVIewItemViewController {
     @IBOutlet var power3TableView: NSScrollView!
     @IBOutlet weak var standardDeviationField: NSTextField!
     
-    override var nibName: String! {
-        return "ShipViewController"
+    private var sortDescriptorsObservation: NSKeyValueObservation?
+    private var arrangedObjectsObservation: NSKeyValueObservation?
+    
+    override var nibName: NSNib.Name {
+        
+        return .nibName(instanceOf: self)
     }
+    
     override var hasShipTypeSelector: Bool { return true }
-    override var selectedShipType: ShipType {
+    override var selectedShipType: ShipTabType {
+        
         didSet {
-            shipController.filterPredicate = predicate(for: selectedShipType)
+            shipController.filterPredicate = shipTypePredicte
             shipController.rearrangeObjects()
         }
     }
     
-    var standardDeviation: Double {
-        guard let ships = shipController.arrangedObjects as? [Ship],
-            !ships.isEmpty,
-            let avg = shipController.value(forKeyPath: "arrangedObjects.@avg.lv") as? Double
-            else { return 0.0 }
+    @objc var standardDeviation: Double {
+        
+        guard let ships = shipController.arrangedObjects as? [Ship], !ships.isEmpty else { return 0.0 }
+        guard let avg = shipController.value(forKeyPath: "arrangedObjects.@avg.lv") as? Double else { return 0.0 }
+        
         let total = ships.reduce(0.0) {
+            
             let delta = Double($1.lv) - avg
+            
             return $0 + delta * delta
         }
+        
         return sqrt(total / Double(ships.count))
     }
     
-    fileprivate weak var currentTableView: NSView?
+    private weak var currentTableView: NSView?
     
     override func viewDidLoad() {
+        
         super.viewDidLoad()
         
         currentTableView = expTableView
         
         do {
+            
             try shipController.fetch(with: nil, merge: true)
+            
         } catch {
+            
             fatalError("ShipViewController: can not fetch. \(error)")
+            
+        }
+        
+        shipController.sortDescriptors = UserDefaults.standard[.shipviewSortDescriptors]
+        
+        sortDescriptorsObservation = shipController.observe(\NSArrayController.sortDescriptors) { [weak self] _, _ in
+            
+            UserDefaults.standard[.shipviewSortDescriptors] = self?.shipController.sortDescriptors ?? []
+        }
+        arrangedObjectsObservation = shipController.observe(\NSArrayController.arrangedObjects) { [weak self] _, _ in
+            
+            self?.notifyChangeValue(forKey: #keyPath(standardDeviation))
         }
-        shipController.sortDescriptors = UserDefaults.standard.shipviewSortDescriptors
-        shipController.addObserver(self, forKeyPath: NSSortDescriptorsBinding, context: nil)
-        shipController.addObserver(self, forKeyPath: #keyPath(shipController.arrangedObjects), context: nil)
         
         let tableViews = [expTableView, powerTableView, power2TableView, power3TableView]
         tableViews
             .forEach {
+                
                 NotificationCenter.default
-                    .addObserver(forName: .NSScrollViewDidEndLiveScroll, object: $0, queue: nil) {
+                    .addObserver(forName: NSScrollView.didEndLiveScrollNotification, object: $0, queue: nil) {
+                        
                         guard let target = $0.object as? NSScrollView else { return }
+                        
                         let visibleRect = target.documentVisibleRect
                         tableViews
                             .filter { $0 != target }
@@ -84,24 +112,11 @@ class ShipViewController: MainTabVIewItemViewController {
             standardDeviationField.isHidden = false
         #endif
     }
-    override func observeValue(forKeyPath keyPath: String?,
-                               of object: Any?,
-                               change: [NSKeyValueChangeKey: Any]?,
-                               context: UnsafeMutableRawPointer?) {
-        if keyPath == NSSortDescriptorsBinding {
-            UserDefaults.standard.shipviewSortDescriptors = shipController.sortDescriptors
-            return
-        }
-        if keyPath == #keyPath(shipController.arrangedObjects) {
-            notifyChangeValue(forKey: #keyPath(standardDeviation))
-            return
-        }
-        
-        super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
-    }
     
-    fileprivate func showView(with type: ViewType) {
+    private func showView(with type: ViewType) {
+        
         let newSelection: NSView = {
+            
             switch type {
             case .exp: return expTableView
             case .power: return powerTableView
@@ -109,9 +124,11 @@ class ShipViewController: MainTabVIewItemViewController {
             case .power3: return power3TableView
             }
         }()
+        
         if currentTableView == newSelection { return }
-        guard let tableView = currentTableView
-            else { return }
+        
+        guard let tableView = currentTableView else { return }
+        
         newSelection.frame = tableView.frame
         newSelection.autoresizingMask = tableView.autoresizingMask
         view.replaceSubview(tableView, with: newSelection)
@@ -120,25 +137,34 @@ class ShipViewController: MainTabVIewItemViewController {
     }
     
     private func tag(_ sender: AnyObject?) -> Int {
-        guard let sender = sender
-            else { return -1 }
-        if let control = sender as? NSSegmentedControl,
-            let cell = sender.cell as? NSSegmentedCell {
-            return cell.tag(forSegment: control.selectedSegment)
-        }
-        if let control = sender as? NSControl {
+        
+        switch sender {
+            
+        case let segmented as NSSegmentedControl:
+            let cell = segmented.cell as? NSSegmentedCell
+            
+            return cell?.tag(forSegment: segmented.selectedSegment) ?? -1
+            
+        case let control as NSControl:
             return control.tag
+            
+        default:
+            return -1
         }
-        return -1
     }
+    
     @IBAction func changeView(_ sender: AnyObject?) {
-        ViewType(rawValue: tag(sender)).map { showView(with: $0) }
+        
+        ViewType(rawValue: tag(sender)).map(showView)
     }
 }
 
 extension ShipViewController: NSTableViewDelegate {
+    
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
+        
         guard let identifier = tableColumn?.identifier else { return nil }
-        return tableView.make(withIdentifier: identifier, owner: nil)
+        
+        return tableView.makeView(withIdentifier: identifier, owner: nil)
     }
 }