Refactored Notification setup to use only the document as object

MacPass/MPDocumentWindowController.h

@@ -31,7 +31,6 @@
 - (void)showPasswordInput;
 
 #pragma mark Actions
-- (IBAction)performFindPanelAction:(id)sender;
 - (IBAction)saveDocument:(id)sender;
 
 - (IBAction)editPassword:(id)sender;

MacPass/MPDocumentWindowController.m

@@ -81,9 +81,12 @@ typedef NS_ENUM(NSUInteger, MPAlertContext) {
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didRevertDocument:) name:MPDocumentDidRevertNotifiation object:[self document]];
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showEntries) name:MPDocumentDidUnlockDatabaseNotification object:[self document]];
   
-  [_entryViewController setupNotifications:self];
+  MPDocument *document = [self document];
-  [_inspectorViewController setupNotifications:self];
+  
-  [_outlineViewController setupNotifications:self];
+  [_entryViewController regsiterNotificationsForDocument:document];
+  [_inspectorViewController regsiterNotificationsForDocument:document];
+  [_outlineViewController regsiterNotificationsForDocument:document];
+  [_toolbarDelegate regsiterNotificationsForDocument:document];
   
   
   
@@ -110,7 +113,6 @@ typedef NS_ENUM(NSUInteger, MPAlertContext) {
     [inspectorView removeFromSuperview];
   }
 
-  MPDocument *document = [self document];
   if(document.encrypted) {
     [self showPasswordInput];
   }

MacPass/MPEntryViewController.h

@@ -26,6 +26,7 @@ typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
 @class KPKEntry;
 @class MPOutlineViewDelegate;
 @class MPDocumentWindowController;
+@class MPDocument;
 
 @interface MPEntryViewController : MPViewController <NSTableViewDelegate, MPContextBarDelegate>
 
@@ -33,7 +34,7 @@ typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
 @property (readonly, strong) NSArrayController *entryArrayController;
 
 /* Call this after alle viewcontroller are loaded */
-- (void)setupNotifications:(MPDocumentWindowController *)windowController;
+- (void)regsiterNotificationsForDocument:(MPDocument *)document;
 
 /* Copy/Paste */
 - (void)copyUsername:(id)sender;

MacPass/MPEntryViewController.m

@@ -98,11 +98,6 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
     _dataSource.viewController = self;
     _menuDelegate = [[MPEntryContextMenuDelegate alloc] init];
     _contextBarViewController = [[MPContextBarViewController alloc] init];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(_updateSearchResults:)
-                                                 name:MPDocumentDidChangeSearchNotification
-                                               object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showFilter:) name:MPDocumentDidEnterSearchNotification object:nil];
   }
   return self;
 }
@@ -196,12 +191,22 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
   return self.entryTable;
 }
 
-- (void)setupNotifications:(MPDocumentWindowController *)windowController {
+- (void)regsiterNotificationsForDocument:(MPDocument *)document {
-  MPDocument *document = [windowController document];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(_didChangeCurrentItem:)
                                                name:MPCurrentItemChangedNotification
                                              object:document];
+  
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(_updateSearchResults:)
+                                               name:MPDocumentDidChangeSearchNotification
+                                             object:document];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(showFilter:)
+                                               name:MPDocumentDidEnterSearchNotification
+                                             object:document];
+  
+  
 }
 
 #pragma mark NSTableViewDelgate
@@ -356,10 +361,6 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
 }
 
 - (void)showFilter:(NSNotification *)notification {
-  MPDocument *currentDocument = [[self windowController] document];
-  if(notification && [notification object] != currentDocument) {
-    return; // Wrong document
-  }
   [self.contextBarViewController showFilter];
   [self _showContextBar];
 }

MacPass/MPInspectorViewController.h

@@ -26,6 +26,6 @@
 - (IBAction)toggleEdit:(id)sender;
 
 /* Seperate call to ensure alle registered objects are in place */
-- (void)setupNotifications:(NSWindowController *)windowController;
+- (void)regsiterNotificationsForDocument:(NSDocument *)document;
 
 @end

MacPass/MPInspectorViewController.m

@@ -107,8 +107,7 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
   [self _updateBindings:nil];
 }
 
-- (void)setupNotifications:(NSWindowController *)windowController {
+- (void)regsiterNotificationsForDocument:(MPDocument *)document {
-  MPDocument *document = [windowController document];
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(_didChangeCurrentItem:)
                                                name:MPCurrentItemChangedNotification

MacPass/MPOutlineViewController.h

@@ -12,7 +12,7 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection;
 
 @class MPOutlineViewDelegate;
 @class HNHGradientView;
-@class MPDocumentWindowController;
+@class MPDocument;
 
 @interface MPOutlineViewController : MPViewController <NSOutlineViewDelegate, NSMenuDelegate>
 
@@ -21,7 +21,7 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection;
 
 - (void)clearSelection;
 - (void)showOutline;
-- (void)setupNotifications:(MPDocumentWindowController *)windowController;
+- (void)regsiterNotificationsForDocument:(MPDocument *)document;
 
 - (void)createGroup:(id)sender;
 - (void)createEntry:(id)sender;

MacPass/MPOutlineViewController.m

@@ -136,7 +136,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 
 #pragma mark Notifications
-- (void)setupNotifications:(MPDocumentWindowController *)windowController {
+- (void)regsiterNotificationsForDocument:(MPDocument *)document {
   // Nothing to do anymore
 }
 

MacPass/MPToolbarDelegate.h

@@ -22,10 +22,12 @@
 
 #import <Foundation/Foundation.h>
 
-@class MPDocumentWindowController;
+@class MPDocument;
 
 @interface MPToolbarDelegate : NSObject <NSToolbarDelegate>
 
 @property (weak, readonly) NSSearchField *searchField;
 
+- (void)regsiterNotificationsForDocument:(MPDocument *)document;
+
 @end

MacPass/MPToolbarDelegate.m

@@ -66,7 +66,6 @@ NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
     _toolbarImages = [self createToolbarImages];
     _toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
     _entryMenuDelegate = [[MPAddEntryContextMenuDelegate alloc] init];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didExitSearch:) name:MPDocumentDidExitSearchNotification object:self];
   }
   return self;
 }
@@ -187,6 +186,12 @@ NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
   return imageDict;
 }
 
+
+- (void)regsiterNotificationsForDocument:(MPDocument *)document {
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didExitSearch:) name:MPDocumentDidExitSearchNotification object:document];
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didExitSearch:) name:MPDocumentDidEnterSearchNotification object:document];
+}
+
 - (NSString *)_localizedLabelForToolbarItemIdentifier:(NSString *)identifier {
   static NSDictionary *labelDict;
   static dispatch_once_t onceToken;
@@ -220,6 +225,7 @@ NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
 
 - (void)_didExitSearch:(NSNotification *)notification {
   [self.searchField setStringValue:@""];
+  [[self.searchField window] makeFirstResponder:nil];
 }
 
 @end