diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-04-22 17:44:57 +0000 |
| commit | 4611475c5b255eed9202474dd3bdee147e932946 (patch) | |
| tree | 39bdc50e046f802265950c6e2607ca9ebda453be /Source/SPNavigatorController.m | |
| parent | 3ed8b33deeadcc98185911f41bc6bcb4e53b4719 (diff) | |
| download | sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.gz sequelpro-4611475c5b255eed9202474dd3bdee147e932946.tar.bz2 sequelpro-4611475c5b255eed9202474dd3bdee147e932946.zip | |
Bring outline view branch up to date with trunk (r3234:3277).
Diffstat (limited to 'Source/SPNavigatorController.m')
| -rw-r--r-- | Source/SPNavigatorController.m | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m index 36dddf39..be24948b 100644 --- a/Source/SPNavigatorController.m +++ b/Source/SPNavigatorController.m @@ -23,6 +23,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPNavigatorController.h" +#ifndef SP_REFACTOR /* headers */ #import "RegexKitLite.h" #import "SPNavigatorOutlineView.h" #import "ImageAndTextCell.h" @@ -34,18 +35,23 @@ #import "SPDatabaseViewController.h" #import <objc/message.h> +#endif static SPNavigatorController *sharedNavigatorController = nil; +#ifndef SP_REFACTOR /* pasteboard types */ #define DragFromNavigatorPboardType @"SPDragFromNavigatorPboardType" #define DragTableDataFromNavigatorPboardType @"SPDragTableDataFromNavigatorPboardType" +#endif @implementation SPNavigatorController +#ifndef SP_REFACTOR /* unused sort func */ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* context) { return (NSComparisonResult)objc_msgSend(s1, @selector(localizedCompare:), s2); } +#endif /** @@ -80,13 +86,14 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte cachedSortedKeys = [[NSMutableDictionary alloc] init]; infoArray = [[NSMutableArray alloc] init]; updatingConnections = [[NSMutableArray alloc] init]; +#ifndef SP_REFACTOR selectedKey2 = @""; ignoreUpdate = NO; isFiltered = NO; isFiltering = NO; [syncButton setState:NSOffState]; NSDictionaryClass = [NSDictionary class]; - +#endif } return self; @@ -103,6 +110,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte if(updatingConnections) [updatingConnections release]; if(expandStatus2) [expandStatus2 release]; if(cachedSortedKeys) [cachedSortedKeys release]; +#ifndef SP_REFACTOR /* dealloc ivars */ [connectionIcon release]; [databaseIcon release]; [tableIcon release]; @@ -110,6 +118,10 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte [procedureIcon release]; [functionIcon release]; [fieldIcon release]; +#endif +#ifdef SP_REFACTOR /* patch */ + [super dealloc]; +#endif } /** * The following base protocol methods are implemented to ensure the singleton status of this class. @@ -125,6 +137,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte - (void)release { } +#ifndef SP_REFACTOR /** * Set the window's auto save name and initialise display */ @@ -487,6 +500,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte [[schemaData objectForKey:connectionID] removeObjectForKey:db_id]; [outlineSchema2 reloadData]; } +#endif - (NSDictionary *)dbStructureForConnection:(NSString*)connectionID { @@ -550,6 +564,7 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte return [NSArray arrayWithObjects:[NSNumber numberWithInt:0], @"", nil]; } +#ifndef SP_REFACTOR - (BOOL)isUpdatingConnection:(NSString*)connectionID { @@ -1253,4 +1268,5 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte } return @""; } +#endif @end |