HMMasterMissionCommandクラスをSwiftで書き換え

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

diff --git a/KCD/HMSlotItemWindowController.swift b/KCD/HMSlotItemWindowController.swift
index e33338e..bb40488 100644 (file)
--- a/KCD/HMSlotItemWindowController.swift
+++ b/KCD/HMSlotItemWindowController.swift
@@ -22,29 +22,30 @@ class HMSlotItemWindowController: NSWindowController
        }
        
        class func create() -> HMSlotItemWindowController {
-               return HMSlotItemWindowController.init(windowNibName:"HMSlotItemWindowController")
+               return HMSlotItemWindowController(windowNibName: "HMSlotItemWindowController")
        }
        
-       var managedObjectContext : NSManagedObjectContext {
+       var managedObjectContext: NSManagedObjectContext? {
                return HMServerDataStore.defaultManager().managedObjectContext
        }
        
-       @IBOutlet var slotItemController : NSArrayController?
+       @IBOutlet var slotItemController: NSArrayController!
        
-    override func windowDidLoad() {
-        super.windowDidLoad()
-               
-               var error : NSErrorPointer = nil
-               self.slotItemController?.fetchWithRequest(nil, merge: true, error: error)
-               self.slotItemController?.sortDescriptors = HMUserDefaults.hmStandardDefauls().slotItemSortDescriptors
-               self.slotItemController?.addObserver(self, forKeyPath: NSSortDescriptorsBinding, options: .Initial, context: nil)
+    override func awakeFromNib() {
+               var error: NSError? = nil
+               self.slotItemController.fetchWithRequest(nil, merge: true, error: &error)
+               self.slotItemController.sortDescriptors = HMUserDefaults.hmStandardDefauls().slotItemSortDescriptors
+               self.slotItemController.addObserver(self, forKeyPath: NSSortDescriptorsBinding, options: .Initial, context: nil)
     }
        
        override func observeValueForKeyPath(keyPath: String, ofObject object: AnyObject, change: [NSObject : AnyObject], context: UnsafeMutablePointer<Void>) {
-               if keyPath == NSSortDescriptorsBinding {
-                       HMUserDefaults.hmStandardDefauls().slotItemSortDescriptors = self.slotItemController?.sortDescriptors
-                       return
+               switch keyPath {
+               case NSSortDescriptorsBinding:
+                       if let sortDescriptors = slotItemController.sortDescriptors as? [NSSortDescriptor] {
+                               HMUserDefaults.hmStandardDefauls().slotItemSortDescriptors = sortDescriptors
+                       }
+               default:
+                       super.observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context)
                }
-               super.observeValueForKeyPath(keyPath, ofObject: object, change: change, context: context)
        }
 }