関数名を変更

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

diff --git a/KCD/AirPlanInfoView.swift b/KCD/AirPlanInfoView.swift
index 238a046..4d5092d 100644 (file)
--- a/KCD/AirPlanInfoView.swift
+++ b/KCD/AirPlanInfoView.swift
@@ -8,75 +8,90 @@
 
 import Cocoa
 
-class AirPlanInfoView: NSTableCellView {
+final class AirPlanInfoView: NSTableCellView {
     
     enum Condition: Int {
+        
         case normal = 1
         case tired = 2
         case bad = 3
     }
     
+    static let conditionBindingName = NSBindingName(#keyPath(AirPlanInfoView.condition))
+    static let slotIDBindingName = NSBindingName(#keyPath(AirPlanInfoView.slotId))
+    static let maxCountBindingName = NSBindingName(#keyPath(AirPlanInfoView.maxCount))
+    static let countBindingName = NSBindingName(#keyPath(AirPlanInfoView.count))
+    
     @IBOutlet var planNameVew: SlotItemLevelView!
     @IBOutlet var conditionBox: NSBox!
     @IBOutlet var needSupplyField: NSTextField!
     
-    dynamic var condition: Int = 1 {
+    @objc dynamic var condition: Int = 1 {
+        
         didSet {
-            guard let cond = Condition(rawValue: condition)
-                else { return }
+            guard let cond = Condition(rawValue: condition) else { return }
+            
             conditionBox.fillColor = conditionColor(cond)
             conditionBox.borderColor = borderColor(cond)
         }
     }
-    dynamic var slotId: NSNumber? {
+    
+    @objc dynamic var slotId: NSNumber? {
+        
         didSet { planNameVew.slotItemID = slotId }
     }
-    dynamic var maxCount: Int = 0 {
+    
+    @objc dynamic var maxCount: Int = 0 {
+        
         didSet { needSupplyField.isHidden = !needSupply() }
     }
-    dynamic var count: Int = 0 {
+    
+    @objc dynamic var count: Int = 0 {
+        
         didSet { needSupplyField.isHidden = !needSupply() }
     }
+    
     private func conditionColor(_ cond: Condition) -> NSColor {
+        
         switch cond {
         case .normal: return .clear
         case .tired: return #colorLiteral(red: 1, green: 0.7233425379, blue: 0.1258574128, alpha: 0.8239436619)
         case .bad: return #colorLiteral(red: 0.7320367694, green: 0.07731548697, blue: 0.06799335033, alpha: 1)
         }
     }
+    
     private func borderColor(_ cond: Condition) -> NSColor {
+        
         switch cond {
         case .normal: return .clear
         case .tired: return #colorLiteral(red: 0.458858192, green: 0.3335277438, blue: 0.07979661971, alpha: 1)
         case .bad: return #colorLiteral(red: 0.5462518334, green: 0.04599834234, blue: 0.04913448542, alpha: 1)
         }
     }
+    
     private func needSupply() -> Bool {
+        
         return (maxCount - count != 0)
     }
     
     required init?(coder: NSCoder) {
+        
         super.init(coder: coder)
     }
+    
     deinit {
-        unbind(#keyPath(AirPlanInfoView.condition))
-        unbind(#keyPath(AirPlanInfoView.slotId))
-        unbind(#keyPath(AirPlanInfoView.maxCount))
-        unbind(#keyPath(AirPlanInfoView.count))
+        
+        unbind(AirPlanInfoView.conditionBindingName)
+        unbind(AirPlanInfoView.slotIDBindingName)
+        unbind(AirPlanInfoView.maxCountBindingName)
+        unbind(AirPlanInfoView.countBindingName)
     }
     
     override func awakeFromNib() {
-        bind(#keyPath(AirPlanInfoView.condition),
-             to: self,
-             withKeyPath: "objectValue.cond")
-        bind(#keyPath(AirPlanInfoView.slotId),
-             to: self,
-             withKeyPath: "objectValue.slotid")
-        bind(#keyPath(AirPlanInfoView.maxCount),
-             to: self,
-             withKeyPath: "objectValue.max_count")
-        bind(#keyPath(AirPlanInfoView.count),
-             to: self,
-             withKeyPath: "objectValue.count")
+        
+        bind(AirPlanInfoView.conditionBindingName, to: self, withKeyPath: "objectValue.cond")
+        bind(AirPlanInfoView.slotIDBindingName, to: self, withKeyPath: "objectValue.slotid")
+        bind(AirPlanInfoView.maxCountBindingName, to: self, withKeyPath: "objectValue.max_count")
+        bind(AirPlanInfoView.countBindingName, to: self, withKeyPath: "objectValue.count")
     }
 }