Remove another 2 cases of very strange object notification behavior (…

…code style)
sequelpro · Jan 17, 2018 · ef21bc5 · ef21bc5
1 parent 74b18ee
commit ef21bc5
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 20 deletions.
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
@@ -452,6 +452,8 @@ extern NSString *SPSSHEnableMuxingPreference;
 extern NSString *SPSSHClientPath;
 extern NSString *SPSSLCipherListKey;
 extern NSString *SPQueryFavoritesHaveBeenUpdatedNotification;
+extern NSString *SPHistoryItemsHaveBeenUpdatedNotification;
+extern NSString *SPContentFiltersHaveBeenUpdatedNotification;
 
 // URLs
 extern NSString *SPDonationsURL;

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
@@ -249,6 +249,8 @@
 NSString *SPSSHClientPath                        = @"SSHClientPath";
 NSString *SPSSLCipherListKey                     = @"SSLCipherList";
 NSString *SPQueryFavoritesHaveBeenUpdatedNotification = @"QueryFavoritesHaveBeenUpdatedNotification";
+NSString *SPHistoryItemsHaveBeenUpdatedNotification   = @"HistoryItemsHaveBeenUpdatedNotification";
+NSString *SPContentFiltersHaveBeenUpdatedNotification = @"ContentFiltersHaveBeenUpdatedNotification";
 
 // URLs
 NSString *SPDonationsURL                         = @"http://www.sequelpro.com/donate/";

diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h
@@ -31,12 +31,6 @@
 @class SPDatabaseDocument;
 @class SPSplitView;
 
-@interface NSObject (SPContentFilterManagerDelegate)
-
-- (void)contentFiltersHaveBeenUpdated:(id)manager;
-
-@end
-
 @interface SPContentFilterManager : NSWindowController <NSOpenSavePanelDelegate>
 {
 #ifndef SP_CODA /* ivars */

diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
@@ -406,11 +406,8 @@ - (IBAction)closeContentFilterManagerSheet:(id)sender
 		[cf release];
 
 		// Inform all opened documents to update the query favorites list
-		for(id doc in [SPAppDelegate orderedDocuments])
-			if([[doc valueForKeyPath:@"tableContentInstance"] respondsToSelector:@selector(setCompareTypes:)])
-				[[doc valueForKeyPath:@"tableContentInstance"] setCompareTypes:nil];
+		[[NSNotificationCenter defaultCenter] postNotificationName:SPContentFiltersHaveBeenUpdatedNotification object:self];
 #endif
-
 	}
 }
 

diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h
@@ -298,7 +298,6 @@
 - (NSRange)currentQueryRange;
 - (NSString *)buildHistoryString;
 - (void)addHistoryEntry:(NSString *)entryString;
-- (void)historyItemsHaveBeenUpdated:(id)manager;
 - (void)processFieldEditorResult:(id)data contextInfo:(NSDictionary*)contextInfo;
 
 @end
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
@@ -72,6 +72,7 @@ - (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserv
 + (NSString *)linkToHelpTopic:(NSString *)aTopic;
 - (void)documentWillClose:(NSNotification *)notification;
 - (void)queryFavoritesHaveBeenUpdated:(NSNotification *)notification;
+- (void)historyItemsHaveBeenUpdated:(NSNotification *)notification;
 
 @end
 
@@ -1621,7 +1622,7 @@ - (void)setConnection:(SPMySQLConnection *)theConnection
 
 #ifndef SP_CODA
 	if ( [[SPQueryController sharedQueryController] historyForFileURL:[tableDocumentInstance fileURL]] )
-		[self performSelectorOnMainThread:@selector(historyItemsHaveBeenUpdated:) withObject:self waitUntilDone:YES];
+		[self performSelectorOnMainThread:@selector(historyItemsHaveBeenUpdated:) withObject:nil waitUntilDone:YES];
 
 	// Populate query favorites
 	[self queryFavoritesHaveBeenUpdated:nil];
@@ -3369,8 +3370,12 @@ - (BOOL)windowShouldClose:(id)sender
 
 /**
  * Rebuild history popup menu.
+ *
+ * Warning: notification may be nil if invoked directly from within this class.
+ *
+ * MUST BE CALLED ON THE UI THREAD!
  */
-- (void)historyItemsHaveBeenUpdated:(id)manager
+- (void)historyItemsHaveBeenUpdated:(NSNotification *)notification
 {
 	// Abort if the connection has been closed already - sign of a closed window
 	if (![mySQLConnection isConnected]) return;
@@ -3997,6 +4002,10 @@ - (void)awakeFromNib
 	                                         selector:@selector(queryFavoritesHaveBeenUpdated:)
 	                                             name:SPQueryFavoritesHaveBeenUpdatedNotification
 	                                           object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(historyItemsHaveBeenUpdated:)
+	                                             name:SPHistoryItemsHaveBeenUpdatedNotification
+	                                           object:nil];
 
 #ifndef SP_CODA
 	[prefs addObserver:self forKeyPath:SPGlobalResultTableFont options:NSKeyValueObservingOptionNew context:NULL];

diff --git a/Source/SPQueryDocumentsController.m b/Source/SPQueryDocumentsController.m
@@ -204,13 +204,8 @@ - (void)replaceHistoryByArray:(NSArray *)historyArray forFileURL:(NSURL *)fileUR
 	}
 
 	// Inform all opened documents to update the history list
-	for (id doc in [SPAppDelegate orderedDocuments])
-	{
-		if([[doc valueForKeyPath:@"customQueryInstance"] respondsToSelector:@selector(historyItemsHaveBeenUpdated:)]) {
-			[[doc valueForKeyPath:@"customQueryInstance"] performSelectorOnMainThread:@selector(historyItemsHaveBeenUpdated:) withObject:self waitUntilDone:NO];
-		}
-	}
-
+	[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPHistoryItemsHaveBeenUpdatedNotification object:self];
+
 	// User did choose to clear the global history list
 	if (![fileURL isFileURL] && ![historyArray count]) {
 		[prefs setObject:historyArray forKey:SPQueryHistory];

diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
@@ -83,6 +83,7 @@ @interface SPTableContent ()
 
 - (BOOL)cancelRowEditing;
 - (void)documentWillClose:(NSNotification *)notification;
+- (void)contentFiltersHaveBeenUpdated:(NSNotification *)notification;
 
 @end
 
@@ -305,6 +306,10 @@ - (void)awakeFromNib
 	                                         selector:@selector(documentWillClose:)
 	                                             name:SPDocumentWillCloseNotification
 	                                           object:tableDocumentInstance];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(contentFiltersHaveBeenUpdated:)
+	                                             name:SPContentFiltersHaveBeenUpdatedNotification
+	                                           object:nil];
 }
 
 #pragma mark -
@@ -2595,6 +2600,11 @@ - (void)clickLinkArrowTask:(SPTextAndLinkCell *)theArrowCell
 	[linkPool drain];
 }
 
+- (void)contentFiltersHaveBeenUpdated:(NSNotification *)notification
+{
+	[self setCompareTypes:nil];
+}
+
 /**
  * Sets the compare types for the filter and the appropriate formatter for the textField
  */