From 74cb1152eeb0dcc83f12ea6cf040eacc4e15c551 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Thu, 25 Mar 2010 08:59:35 +0000 Subject: =?UTF-8?q?=E2=80=A2=20Navigator=20-=20make=20usage=20of=20a=20not?= =?UTF-8?q?ification=20sent=20by=20the=20[MCPConnection=20queryDbStructure?= =?UTF-8?q?]=20to=20update=20the=20navigator,=20and=20this=20decouples=20a?= =?UTF-8?q?=20doc=20window=20and=20MCPConnection=20from=20the=20navigator?= =?UTF-8?q?=20-=20minimized=20the=20tree=20update=20-=20now=20connectionID?= =?UTF-8?q?-based=20-=20any=20tree=20update=20will=20be=20now=20performed?= =?UTF-8?q?=20on=20main=20thread=20and=20waits=20until=20done=20to=20avoid?= =?UTF-8?q?=20'overlapping'=20updates=20triggered=20by=20different=20notif?= =?UTF-8?q?ications=20which=20normally=20ended=20up=20in=20an=20inchoate?= =?UTF-8?q?=20tree=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h | 4 +--- Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Frameworks') diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h index 25ef7d36..5fa3fe86 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h @@ -67,9 +67,7 @@ static inline NSData* NSStringDataUsingLossyEncoding(NSString* self, NSInteger e - (NSString *)onReconnectShouldUseEncoding:(id)connection; - (void)noConnectionAvailable:(id)connection; - (MCPConnectionCheck)connectionLost:(id)connection; -- (void)updateNavigator:(id)sender; -- (NSString *)connectionID; - +- (NSString*)connectionID; @end @interface MCPConnection : NSObject diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m index 94fb4434..0685d162 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m @@ -44,7 +44,7 @@ const char *kMCPConnectionDefaultSocket = MYSQL_UNIX_ADDR; const NSUInteger kMCPConnection_Not_Inited = 1000; const NSUInteger kLengthOfTruncationForLog = 100; -static BOOL sTruncateLongFieldInLogs = YES; +static BOOL sTruncateLongFieldInLogs = YES; /** * Privte API @@ -1365,7 +1365,7 @@ void performThreadedKeepAlive(void *ptr) // Reset the query cancelled boolean queryCancelled = NO; - + // If no connection is present, return nil. if (!mConnected) { // Write a log entry @@ -2033,12 +2033,12 @@ void performThreadedKeepAlive(void *ptr) } uniqueDbIdentifier = [[NSDictionary dictionaryWithDictionary:uniqueIdentifier] retain]; - - if(delegate && [delegate respondsToSelector:@selector(updateNavigator:)]) - [[self delegate] updateNavigator:self]; + // Notify that the structure querying has been performed + [[NSNotificationCenter defaultCenter] postNotificationName:@"SPDBStructureWasUpdated" object:delegate]; isQueryingDbStructure = NO; [queryPool release]; + return; } mysql_close(structConnection); -- cgit v1.2.3