diff options
Diffstat (limited to 'Source')
42 files changed, 98 insertions, 98 deletions
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m index 0e13d344..3585eb16 100644 --- a/Source/CustomQuery.m +++ b/Source/CustomQuery.m @@ -31,7 +31,7 @@ #import "SPArrayAdditions.h" #import "SPDataAdditions.h" #import "SPDataCellFormatter.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "RegexKitLite.h" #import "SPFieldEditorController.h" @@ -1283,7 +1283,7 @@ #pragma mark Additional methods /* - * Sets the connection (received from TableDocument) and makes things that have to be done only once + * Sets the connection (received from SPDatabaseDocument) and makes things that have to be done only once */ - (void)setConnection:(MCPConnection *)theConnection { diff --git a/Source/SPAppController.h b/Source/SPAppController.h index e1ed4291..23796e34 100644 --- a/Source/SPAppController.h +++ b/Source/SPAppController.h @@ -26,7 +26,7 @@ #import <Cocoa/Cocoa.h> #import <FeedbackReporter/FRFeedbackReporter.h> -@class SPPreferenceController, SPAboutController, TableDocument; +@class SPPreferenceController, SPAboutController, SPDatabaseDocument; @interface SPAppController : NSObject <FRFeedbackReporterDelegate> { @@ -62,7 +62,7 @@ // Getters - (SPPreferenceController *)preferenceController; - (NSArray *) orderedDatabaseConnectionWindows; -- (TableDocument *) frontDocument; +- (SPDatabaseDocument *) frontDocument; // Feedback controller delegate methods - (NSMutableDictionary*) anonymizePreferencesForFeedbackReport:(NSMutableDictionary *)preferences; diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 5adacb8b..ce1e78c8 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -25,7 +25,7 @@ #import "SPKeychain.h" #import "SPAppController.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPPreferenceController.h" #import "SPAboutController.h" #import "TableDump.h" @@ -275,7 +275,7 @@ } else if([[[filename pathExtension] lowercaseString] isEqualToString:@"spf"]) { - TableDocument *newTableDocument; + SPDatabaseDocument *newTableDocument; // If the frontmost document isn't connected and hasn't been, open the connection file with it. // Otherwise, manually open a new document, setting SPAppController as sender to trigger autoconnection @@ -413,7 +413,7 @@ /** * Retrieve the frontmost document; returns nil if not found. */ -- (TableDocument *) frontDocument +- (SPDatabaseDocument *) frontDocument { for (NSWindow *aWindow in [self orderedWindows]) { if ([[aWindow windowController] isMemberOfClass:[SPWindowController class]]) { @@ -711,7 +711,7 @@ * Support for 'make new document'. * TODO: following tab support this has been disabled - need to discuss reimplmenting vs syntax. */ -- (void)insertInOrderedDocuments:(TableDocument *)doc +- (void)insertInOrderedDocuments:(SPDatabaseDocument *)doc { [self newWindow:self]; /* if ([[NSUserDefaults standardUserDefaults] boolForKey:SPAutoConnectToDefault]) diff --git a/Source/SPCSVExporterDelegate.m b/Source/SPCSVExporterDelegate.m index ed5f4514..4da82285 100644 --- a/Source/SPCSVExporterDelegate.m +++ b/Source/SPCSVExporterDelegate.m @@ -27,7 +27,7 @@ #import "SPCSVExporter.h" #import "SPCSVExporterDelegate.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPMainThreadTrampoline.h" #import "SPFileHandle.h" diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 3e272abc..6a47f9ac 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -26,7 +26,7 @@ #import <Cocoa/Cocoa.h> #import <MCPKit/MCPKit.h> -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPKeychain.h" #import "SPSSHTunnel.h" @@ -49,7 +49,7 @@ { id delegate; - TableDocument *tableDocument; + SPDatabaseDocument *tableDocument; NSView *databaseConnectionSuperview; NSSplitView *databaseConnectionView; SPKeychain *keychain; @@ -127,7 +127,7 @@ @property (readwrite, retain) NSString *connectionSSHKeychainItemName; @property (readwrite, retain) NSString *connectionSSHKeychainItemAccount; -- (id)initWithDocument:(TableDocument *)theTableDocument; +- (id)initWithDocument:(SPDatabaseDocument *)theTableDocument; // Connection processes - (IBAction)initiateConnection:(id)sender; diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 5e70b516..631cb2ed 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -56,7 +56,7 @@ * Initialise the connection controller, linking it to the * parent document and setting up the parent window. */ -- (id) initWithDocument:(TableDocument *)theTableDocument +- (id) initWithDocument:(SPDatabaseDocument *)theTableDocument { if (self = [super init]) { tableDocument = theTableDocument; diff --git a/Source/SPConnectionDelegate.h b/Source/SPConnectionDelegate.h index f3b3968d..614ec7bc 100644 --- a/Source/SPConnectionDelegate.h +++ b/Source/SPConnectionDelegate.h @@ -23,8 +23,8 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "TableDocument.h" +#import "SPDatabaseDocument.h" -@interface TableDocument (SPConnectionDelegate) +@interface SPDatabaseDocument (SPConnectionDelegate) @end diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m index 65ffa3f9..9d49d298 100644 --- a/Source/SPConnectionDelegate.m +++ b/Source/SPConnectionDelegate.m @@ -30,7 +30,7 @@ #import "SPConstants.h" #import "SPAlertSheets.h" -@implementation TableDocument (SPConnectionDelegate) +@implementation SPDatabaseDocument (SPConnectionDelegate) #pragma mark - #pragma mark MCPKit connection delegate methods diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h index ba41a34f..e71934d8 100644 --- a/Source/SPContentFilterManager.h +++ b/Source/SPContentFilterManager.h @@ -25,7 +25,7 @@ #import <Cocoa/Cocoa.h> -@class BWAnchoredButtonBar, TableDocument; +@class BWAnchoredButtonBar, SPDatabaseDocument; @interface NSObject (SPContentFilterManagerDelegate) @@ -37,7 +37,7 @@ { NSUserDefaults *prefs; - TableDocument *tableDocumentInstance; + SPDatabaseDocument *tableDocumentInstance; NSURL *delegatesFileURL; IBOutlet id encodingPopUp; IBOutlet id contentFilterTableView; diff --git a/Source/TableDocument.h b/Source/SPDatabaseDocument.h index 5b6697a6..ae92ec84 100644 --- a/Source/TableDocument.h +++ b/Source/SPDatabaseDocument.h @@ -1,7 +1,7 @@ // // $Id$ // -// TableDocument.h +// SPDatabaseDocument.h // sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. @@ -32,9 +32,9 @@ @class SPConnectionController, SPProcessListController, SPServerVariablesController, SPUserManager, SPWindowController; /** - * The TableDocument class controls the primary database view window. + * The SPDatabaseDocument class controls the primary database view window. */ -@interface TableDocument : NSObject <NSUserInterfaceValidations> +@interface SPDatabaseDocument : NSObject <NSUserInterfaceValidations> { // IBOutlets IBOutlet id tablesListInstance; diff --git a/Source/TableDocument.m b/Source/SPDatabaseDocument.m index c418e95b..2120a85d 100644 --- a/Source/TableDocument.m +++ b/Source/SPDatabaseDocument.m @@ -1,7 +1,7 @@ // // $Id$ // -// TableDocument.m +// SPDatabaseDocument.m // sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. @@ -25,7 +25,7 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableStructure.h" #import "SPTableContent.h" @@ -61,7 +61,7 @@ #import "SPTableCopy.h" #import "SPDatabaseRename.h" -@interface TableDocument (PrivateAPI) +@interface SPDatabaseDocument (PrivateAPI) - (void)_addDatabase; - (void)_copyDatabase; @@ -71,7 +71,7 @@ @end -@implementation TableDocument +@implementation SPDatabaseDocument @synthesize parentWindowController; @synthesize parentTabViewItem; @@ -2390,7 +2390,7 @@ - (IBAction)openCurrentConnectionInNewWindow:(id)sender { [[NSApp delegate] newWindow:self]; - TableDocument *newTableDocument = [[NSApp delegate] frontDocument]; + SPDatabaseDocument *newTableDocument = [[NSApp delegate] frontDocument]; [newTableDocument initWithConnectionFile:[[self fileURL] path]]; } @@ -3457,7 +3457,7 @@ { NSMutableString *tabTitle; NSMutableString *windowTitle; - TableDocument *frontTableDocument = [parentWindowController selectedTableDocument]; + SPDatabaseDocument *frontTableDocument = [parentWindowController selectedTableDocument]; // Determine name details NSString *pathName = @""; @@ -4284,7 +4284,7 @@ @end -@implementation TableDocument (PrivateAPI) +@implementation SPDatabaseDocument (PrivateAPI) - (void)_copyDatabase { if ([[databaseCopyNameField stringValue] isEqualToString:@""]) { diff --git a/Source/SPDotExporterDelegate.m b/Source/SPDotExporterDelegate.m index ce74e408..6d1b8954 100644 --- a/Source/SPDotExporterDelegate.m +++ b/Source/SPDotExporterDelegate.m @@ -25,7 +25,7 @@ #import "SPDotExporterDelegate.h" #import "SPDotExporter.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPMainThreadTrampoline.h" @implementation SPExportController (SPDotExporterDelegate) diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m index 7b82de87..1d128e91 100644 --- a/Source/SPExportInitializer.m +++ b/Source/SPExportInitializer.m @@ -28,11 +28,11 @@ #import "SPExportInitializer.h" #import "SPStringAdditions.h" #import "SPTableData.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPGrowlController.h" #import "SPMainThreadTrampoline.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "CustomQuery.h" #import "SPFileHandle.h" #import "SPAlertSheets.h" diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 56f7a76c..605cec35 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -29,7 +29,7 @@ #import "SPDatabaseData.h" #import "SPStringAdditions.h" #import "SPConstants.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPAlertSheets.h" #import "SPTableStructure.h" diff --git a/Source/SPGrowlController.h b/Source/SPGrowlController.h index e3f054a5..ca52ccd1 100644 --- a/Source/SPGrowlController.h +++ b/Source/SPGrowlController.h @@ -26,7 +26,7 @@ #import <Cocoa/Cocoa.h> #import <Growl/Growl.h> -@class TableDocument; +@class SPDatabaseDocument; @interface SPGrowlController : NSObject <GrowlApplicationBridgeDelegate> { @@ -40,14 +40,14 @@ // Post notification - (void)notifyWithTitle:(NSString *)title description:(NSString *)description - document:(TableDocument *)document + document:(SPDatabaseDocument *)document notificationName:(NSString *)name; - (void)notifyWithObject:(NSDictionary *)notificationDictionary; - (void)notifyWithTitle:(NSString *)title description:(NSString *)description - document:(TableDocument *)document + document:(SPDatabaseDocument *)document notificationName:(NSString *)name iconData:(NSData *)data priority:(NSInteger)priority diff --git a/Source/SPGrowlController.m b/Source/SPGrowlController.m index 50ca4906..8a1f60d3 100644 --- a/Source/SPGrowlController.m +++ b/Source/SPGrowlController.m @@ -86,7 +86,7 @@ static SPGrowlController *sharedGrowlController = nil; * Calls the notification after a tiny delay to allow isKeyWindow to have updated * after tasks. */ -- (void)notifyWithTitle:(NSString *)title description:(NSString *)description document:(TableDocument *)document notificationName:(NSString *)name +- (void)notifyWithTitle:(NSString *)title description:(NSString *)description document:(SPDatabaseDocument *)document notificationName:(NSString *)name { // Ensure that the delayed notification call is made on the main thread @@ -125,7 +125,7 @@ static SPGrowlController *sharedGrowlController = nil; /** * Posts a Growl notification using the supplied details and effectively ignoring the default values. */ -- (void)notifyWithTitle:(NSString *)title description:(NSString *)description document:(TableDocument *)document notificationName:(NSString *)name iconData:(NSData *)data priority:(NSInteger)priority isSticky:(BOOL)sticky clickContext:(id)clickContext +- (void)notifyWithTitle:(NSString *)title description:(NSString *)description document:(SPDatabaseDocument *)document notificationName:(NSString *)name iconData:(NSData *)data priority:(NSInteger)priority isSticky:(BOOL)sticky clickContext:(id)clickContext { BOOL postNotification = YES; @@ -170,7 +170,7 @@ static SPGrowlController *sharedGrowlController = nil; // Loop through the windows, looking for the document for (NSWindow *eachWindow in [NSApp orderedWindows]) { if ([[eachWindow windowController] isKindOfClass:[SPWindowController class]]) { - for (TableDocument *eachDocument in [[eachWindow windowController] documents]) { + for (SPDatabaseDocument *eachDocument in [[eachWindow windowController] documents]) { if ([eachDocument hash] == documentHash) { [NSApp activateIgnoringOtherApps:YES]; [eachDocument makeKeyDocument]; diff --git a/Source/SPHistoryController.h b/Source/SPHistoryController.h index 5dcd6962..825b8fc0 100644 --- a/Source/SPHistoryController.h +++ b/Source/SPHistoryController.h @@ -24,11 +24,11 @@ #import <Cocoa/Cocoa.h> -@class TableDocument, SPTableContent, SPTablesList; +@class SPDatabaseDocument, SPTableContent, SPTablesList; @interface SPHistoryController : NSObject { - IBOutlet TableDocument *theDocument; + IBOutlet SPDatabaseDocument *theDocument; IBOutlet NSSegmentedControl *historyControl; SPTableContent *tableContentInstance; diff --git a/Source/SPHistoryController.m b/Source/SPHistoryController.m index c6ae150c..9e7f20da 100644 --- a/Source/SPHistoryController.m +++ b/Source/SPHistoryController.m @@ -22,7 +22,7 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTableContent.h" #import "SPTablesList.h" #import "SPConstants.h" diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m index 738430d4..08e7b847 100644 --- a/Source/SPNavigatorController.m +++ b/Source/SPNavigatorController.m @@ -27,7 +27,7 @@ #import "SPNavigatorOutlineView.h" #import "SPConstants.h" #import "ImageAndTextCell.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPArrayAdditions.h" #import "SPLogger.h" @@ -384,7 +384,7 @@ static SPNavigatorController *sharedNavigatorController = nil; NSArray *pathArray = [[[parentKeys objectAtIndex:0] description] componentsSeparatedByString:SPUniqueSchemaDelimiter]; if([pathArray count] > 1) { - TableDocument *doc = [[NSApp delegate] frontDocument]; + SPDatabaseDocument *doc = [[NSApp delegate] frontDocument]; if([doc isWorking]) { [SPTooltip showWithObject:NSLocalizedString(@"Active connection window is busy. Please wait and try again.", @"active connection window is busy. please wait and try again. tooltip") atLocation:pos @@ -412,7 +412,7 @@ static SPNavigatorController *sharedNavigatorController = nil; id object = [aNotification object]; - if([object isKindOfClass:[TableDocument class]]) + if([object isKindOfClass:[SPDatabaseDocument class]]) [self performSelectorOnMainThread:@selector(updateEntriesForConnection:) withObject:object waitUntilDone:NO]; else [self performSelectorOnMainThread:@selector(updateEntriesForConnection:) withObject:nil waitUntilDone:NO]; @@ -432,7 +432,7 @@ static SPNavigatorController *sharedNavigatorController = nil; } - if (doc && [doc isKindOfClass:[TableDocument class]]) { + if (doc && [doc isKindOfClass:[SPDatabaseDocument class]]) { id theConnection = [doc valueForKeyPath:@"mySQLConnection"]; @@ -742,7 +742,7 @@ static SPNavigatorController *sharedNavigatorController = nil; [searchField setStringValue:@""]; } - TableDocument *doc = [[NSApp delegate] frontDocument]; + SPDatabaseDocument *doc = [[NSApp delegate] frontDocument]; if (doc) { NSMutableString *key = [NSMutableString string]; [key setString:[doc connectionID]]; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index e27c9b05..2a621325 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -27,7 +27,7 @@ #import "SPWindowAdditions.h" #import "SPFavoriteTextFieldCell.h" #import "SPKeychain.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPConnectionController.h" @interface SPPreferenceController (PrivateAPI) diff --git a/Source/SPPrintController.h b/Source/SPPrintController.h index 3982b152..409d98e5 100644 --- a/Source/SPPrintController.h +++ b/Source/SPPrintController.h @@ -23,9 +23,9 @@ // // More info at <http://code.google.com/p/sequel-pro/> -#import "TableDocument.h" +#import "SPDatabaseDocument.h" -@interface TableDocument (SPPrintController) +@interface SPDatabaseDocument (SPPrintController) - (void)startPrintDocumentOperation; - (void)generateHTMLForPrinting; diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m index f01d0ac6..2bfe8715 100644 --- a/Source/SPPrintController.m +++ b/Source/SPPrintController.m @@ -36,7 +36,7 @@ #import "SPExtendedTableInfo.h" #import "SPTableTriggers.h" -@implementation TableDocument (SPPrintController) +@implementation SPDatabaseDocument (SPPrintController) /** * WebView delegate method. diff --git a/Source/SPProcessListController.m b/Source/SPProcessListController.m index 83b9ae54..34405701 100644 --- a/Source/SPProcessListController.m +++ b/Source/SPProcessListController.m @@ -25,7 +25,7 @@ #import "SPProcessListController.h" #import "SPArrayAdditions.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPConstants.h" #import "SPAlertSheets.h" @@ -183,7 +183,7 @@ { // If the document is currently performing a task (most likely threaded) on the current connection, don't // allow a refresh to prevent connection lock errors. - if ([(TableDocument *)[connection delegate] isWorking]) return; + if ([(SPDatabaseDocument *)[connection delegate] isWorking]) return; // Start progress Indicator [refreshProgressIndicator startAnimation:self]; diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index e62244ef..e03193ae 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -25,7 +25,7 @@ #import <Cocoa/Cocoa.h> -@class BWAnchoredButtonBar, SPTextView, TableDocument; +@class BWAnchoredButtonBar, SPTextView, SPDatabaseDocument; @interface NSObject (SPQueryFavoriteManagerDelegate) @@ -38,7 +38,7 @@ NSUserDefaults *prefs; NSURL *delegatesFileURL; - TableDocument *tableDocumentInstance; + SPDatabaseDocument *tableDocumentInstance; IBOutlet NSPopUpButton *encodingPopUp; IBOutlet NSTableView *favoritesTableView; IBOutlet NSTextField *favoriteNameTextField; diff --git a/Source/SPSQLExporterDelegate.m b/Source/SPSQLExporterDelegate.m index 8be899f6..2aad2f7e 100644 --- a/Source/SPSQLExporterDelegate.m +++ b/Source/SPSQLExporterDelegate.m @@ -25,7 +25,7 @@ #import "SPSQLExporterDelegate.h" #import "SPSQLExporter.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPMainThreadTrampoline.h" @implementation SPExportController (SPSQLExporterDelegate) diff --git a/Source/SPServerVariablesController.m b/Source/SPServerVariablesController.m index 7243298d..a971d855 100644 --- a/Source/SPServerVariablesController.m +++ b/Source/SPServerVariablesController.m @@ -25,7 +25,7 @@ #import "SPServerVariablesController.h" #import "SPArrayAdditions.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPConstants.h" @interface SPServerVariablesController (PrivateAPI) diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 27903634..731e2383 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -1,7 +1,7 @@ // // $Id$ // -// TableDocument.h +// SPDatabaseDocument.h // sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index a040fb1c..79b8910c 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -1,7 +1,7 @@ // // $Id$ // -// TableDocument.h +// SPDatabaseDocument.h // sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. @@ -26,7 +26,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTableContent.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTableStructure.h" #import "SPTableInfo.h" #import "SPTablesList.h" @@ -1834,7 +1834,7 @@ // Additional methods /** - * Sets the connection (received from TableDocument) and makes things that have to be done only once + * Sets the connection (received from SPDatabaseDocument) and makes things that have to be done only once */ - (void)setConnection:(MCPConnection *)theConnection { diff --git a/Source/SPTableData.m b/Source/SPTableData.m index 05908853..ea9229cb 100644 --- a/Source/SPTableData.m +++ b/Source/SPTableData.m @@ -25,7 +25,7 @@ #import "SPTableData.h" #import "SPSQLParser.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPStringAdditions.h" #import "SPArrayAdditions.h" diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m index 99197a86..e44e8194 100644 --- a/Source/SPTableInfo.m +++ b/Source/SPTableInfo.m @@ -24,7 +24,7 @@ #import "SPTableInfo.h" #import "ImageAndTextCell.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableData.h" #import "SPConstants.h" diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m index ce31daee..4aa6d17c 100644 --- a/Source/SPTableRelations.m +++ b/Source/SPTableRelations.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTableRelations.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableData.h" #import "SPStringAdditions.h" diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m index 2bef1a12..e14e76a1 100644 --- a/Source/SPTableStructure.m +++ b/Source/SPTableStructure.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTableStructure.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTableInfo.h" #import "SPTablesList.h" #import "SPTableData.h" @@ -649,7 +649,7 @@ closes the keySheet #pragma mark Additional methods /** - * Sets the connection (received from TableDocument) and makes things that have to be done only once + * Sets the connection (received from SPDatabaseDocument) and makes things that have to be done only once */ - (void)setConnection:(MCPConnection *)theConnection { diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m index 89aa5634..29667eaa 100644 --- a/Source/SPTableTriggers.m +++ b/Source/SPTableTriggers.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTableTriggers.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableData.h" #import "SPStringAdditions.h" diff --git a/Source/SPTableView.m b/Source/SPTableView.m index a1e44fb6..c94bc686 100644 --- a/Source/SPTableView.m +++ b/Source/SPTableView.m @@ -25,7 +25,7 @@ #import "SPTableView.h" #import "SPQueryFavoriteManager.h" #import "SPArrayAdditions.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPConstants.h" @implementation SPTableView @@ -38,12 +38,12 @@ { // Try to retrieve a reference to the table document (assuming this is frontmost tab) - TableDocument *parentTableDocument = nil; + SPDatabaseDocument *parentTableDocument = nil; if ([[[[[self window] delegate] class] description] isEqualToString:@"SPWindowController"]) { parentTableDocument = [[[self window] delegate] selectedTableDocument]; } - // If TableDocument is performing a task suppress any context menu + // If SPDatabaseDocument is performing a task suppress any context menu if (parentTableDocument && [parentTableDocument isWorking]) return nil; diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index 69fda60d..153e0227 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTablesList.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTableStructure.h" #import "SPTableContent.h" #import "SPTableData.h" @@ -568,7 +568,7 @@ #pragma mark Additional methods /** - * Sets the connection (received from TableDocument) and makes things that have to be done only once + * Sets the connection (received from SPDatabaseDocument) and makes things that have to be done only once */ - (void)setConnection:(MCPConnection *)theConnection { diff --git a/Source/SPTextView.h b/Source/SPTextView.h index f58304b9..f074be4a 100644 --- a/Source/SPTextView.h +++ b/Source/SPTextView.h @@ -30,11 +30,11 @@ #define SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING 10000 -@class SPNarrowDownCompletion, TableDocument, SPTablesList, CustomQuery; +@class SPNarrowDownCompletion, SPDatabaseDocument, SPTablesList, CustomQuery; @interface SPTextView : NSTextView { - IBOutlet TableDocument *tableDocumentInstance; + IBOutlet SPDatabaseDocument *tableDocumentInstance; IBOutlet SPTablesList *tablesListInstance; IBOutlet CustomQuery *customQueryInstance; diff --git a/Source/SPTextView.m b/Source/SPTextView.m index cf468cc7..3fd842d8 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -24,7 +24,7 @@ #import "SPTextView.h" #import "CustomQuery.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPStringAdditions.h" #import "SPArrayAdditions.h" #import "SPTextViewAdditions.h" diff --git a/Source/SPWindowAdditions.m b/Source/SPWindowAdditions.m index f74d92c4..f5c77919 100644 --- a/Source/SPWindowAdditions.m +++ b/Source/SPWindowAdditions.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPWindowAdditions.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" @implementation NSWindow (SPWindowAdditions) @@ -81,7 +81,7 @@ // ------------------------------------------------------------------------------- - (void)swipeWithEvent:(NSEvent *)anEvent { - if([[self delegate] isKindOfClass:[TableDocument class]] + if([[self delegate] isKindOfClass:[SPDatabaseDocument class]] && [[self delegate] valueForKeyPath:@"spHistoryControllerInstance"] && ![[self delegate] isWorking]) if([anEvent deltaX] == -1.0f) diff --git a/Source/SPWindowController.h b/Source/SPWindowController.h index 00754848..d46deb19 100644 --- a/Source/SPWindowController.h +++ b/Source/SPWindowController.h @@ -23,7 +23,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import <Cocoa/Cocoa.h> -@class PSMTabBarControl, TableDocument; +@class PSMTabBarControl, SPDatabaseDocument; @interface SPWindowController : NSWindowController <NSUserInterfaceValidations> { @@ -38,7 +38,7 @@ // Database connection management - (IBAction) addNewConnection:(id)sender; -- (TableDocument *) selectedTableDocument; +- (SPDatabaseDocument *) selectedTableDocument; - (void) updateAllTabTitles:(id)sender; - (IBAction)closeTab:(id)sender; - (NSArray *)documents; diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m index d7b4f6ac..c6400c96 100644 --- a/Source/SPWindowController.m +++ b/Source/SPWindowController.m @@ -24,7 +24,7 @@ #import "SPWindowController.h" #import "SPConstants.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import <PSMTabBar/PSMTabBarControl.h> #import <PSMTabBar/PSMTabStyle.h> @@ -89,7 +89,7 @@ { // Create a new database connection view - TableDocument *newTableDocument = [[TableDocument alloc] init]; + SPDatabaseDocument *newTableDocument = [[SPDatabaseDocument alloc] init]; [newTableDocument setParentWindowController:self]; [newTableDocument setParentWindow:[self window]]; @@ -113,7 +113,7 @@ /** * Retrieve the currently connection view in the window. */ -- (TableDocument *) selectedTableDocument +- (SPDatabaseDocument *) selectedTableDocument { return [[tabView selectedTabViewItem] identifier]; } @@ -127,7 +127,7 @@ - (void) updateAllTabTitles:(id)sender { for (NSTabViewItem *eachItem in [tabView tabViewItems]) { - TableDocument *eachDocument = [eachItem identifier]; + SPDatabaseDocument *eachDocument = [eachItem identifier]; if (eachDocument != sender) [eachDocument updateWindowTitle:self]; } } @@ -140,7 +140,7 @@ { // Return if the frontmost tab shouldn't be closed - TableDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; if (![frontDocument parentTabShouldClose]) return NO; // If there are multiple tabs, close the front tab. @@ -171,7 +171,7 @@ */ - (void)tabView:(NSTabView *)tabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem { - TableDocument *currentlySelectedDocument = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *currentlySelectedDocument = [[tabView selectedTabViewItem] identifier]; [currentlySelectedDocument willResignActiveTabInWindow]; } @@ -180,7 +180,7 @@ */ - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem { - TableDocument *theDocument = [tabViewItem identifier]; + SPDatabaseDocument *theDocument = [tabViewItem identifier]; [theDocument didBecomeActiveTabInWindow]; if ([[self window] isKeyWindow]) [theDocument tabDidBecomeKey]; [self updateAllTabTitles:self]; @@ -191,7 +191,7 @@ */ - (BOOL)tabView:(NSTabView *)aTabView shouldCloseTabViewItem:(NSTabViewItem *)tabViewItem { - TableDocument *theDocument = [tabViewItem identifier]; + SPDatabaseDocument *theDocument = [tabViewItem identifier]; if (![theDocument parentTabShouldClose]) return NO; return YES; } @@ -201,7 +201,7 @@ */ - (void)tabView:(NSTabView *)aTabView didCloseTabViewItem:(NSTabViewItem *)tabViewItem { - TableDocument *theDocument = [tabViewItem identifier]; + SPDatabaseDocument *theDocument = [tabViewItem identifier]; [theDocument removeObserver:self forKeyPath:@"isProcessing"]; [theDocument parentTabDidClose]; } @@ -219,7 +219,7 @@ */ - (void)tabView:(NSTabView*)aTabView didDropTabViewItem:(NSTabViewItem *)tabViewItem inTabBar:(PSMTabBarControl *)tabBarControl { - TableDocument *draggedDocument = [tabViewItem identifier]; + SPDatabaseDocument *draggedDocument = [tabViewItem identifier]; // Grab a reference to the old window NSWindow *draggedFromWindow = [draggedDocument parentWindow]; @@ -257,7 +257,7 @@ - (BOOL)windowShouldClose:(id)sender { for (NSTabViewItem *eachItem in [tabView tabViewItems]) { - TableDocument *eachDocument = [eachItem identifier]; + SPDatabaseDocument *eachDocument = [eachItem identifier]; if (![eachDocument parentTabShouldClose]) return NO; } @@ -282,7 +282,7 @@ */ - (void)windowDidBecomeKey:(NSNotification *)notification { - TableDocument *selectedTab = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *selectedTab = [[tabView selectedTabViewItem] identifier]; [selectedTab tabDidBecomeKey]; // Update the "Close window" item @@ -315,7 +315,7 @@ - (void)windowDidResize:(NSNotification *)notification { for (NSTabViewItem *eachItem in [tabView tabViewItems]) { - TableDocument *eachDocument = [eachItem identifier]; + SPDatabaseDocument *eachDocument = [eachItem identifier]; [eachDocument tabDidResize]; } } @@ -330,7 +330,7 @@ */ - (void) forwardInvocation:(NSInvocation *)theInvocation { - TableDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; SEL theSelector = [theInvocation selector]; if (![frontDocument respondsToSelector:theSelector]) [self doesNotRecognizeSelector:theSelector]; [theInvocation invokeWithTarget:frontDocument]; @@ -365,7 +365,7 @@ { if ([super respondsToSelector:theSelector]) return [super performSelector:theSelector]; - TableDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; if (![frontDocument respondsToSelector:theSelector]) [self doesNotRecognizeSelector:theSelector]; return [frontDocument performSelector:theSelector]; } @@ -377,7 +377,7 @@ { if ([super respondsToSelector:theSelector]) return [super performSelector:theSelector withObject:theObject]; - TableDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; + SPDatabaseDocument *frontDocument = [[tabView selectedTabViewItem] identifier]; if (![frontDocument respondsToSelector:theSelector]) [self doesNotRecognizeSelector:theSelector]; return [frontDocument performSelector:theSelector withObject:theObject]; @@ -395,7 +395,7 @@ { PSMTabBarCell *theCell = [[tabBar cells] objectAtIndex:[tabView indexOfTabViewItem:theItem]]; [[theCell indicator] setControlSize:NSSmallControlSize]; - TableDocument *theDocument = [theItem identifier]; + SPDatabaseDocument *theDocument = [theItem identifier]; [[theCell indicator] setHidden:NO]; NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary]; diff --git a/Source/SPXMLExporterDelegate.m b/Source/SPXMLExporterDelegate.m index b8edaaf9..ace3f0fa 100644 --- a/Source/SPXMLExporterDelegate.m +++ b/Source/SPXMLExporterDelegate.m @@ -26,7 +26,7 @@ #import "SPXMLExporterDelegate.h" #import "SPXMLExporter.h" #import "SPMainThreadTrampoline.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPFileHandle.h" #import "SPStringAdditions.h" diff --git a/Source/TableDump.m b/Source/TableDump.m index f5025509..4ea1255e 100644 --- a/Source/TableDump.m +++ b/Source/TableDump.m @@ -24,7 +24,7 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "TableDump.h" -#import "TableDocument.h" +#import "SPDatabaseDocument.h" #import "SPTablesList.h" #import "SPTableStructure.h" #import "SPTableContent.h" @@ -3021,7 +3021,7 @@ //additional methods - (void)setConnection:(MCPConnection *)theConnection /* - sets the connection (received from TableDocument) and makes things that have to be done only once + sets the connection (received from SPDatabaseDocument) and makes things that have to be done only once */ { NSButtonCell *switchButton = [[NSButtonCell alloc] init]; |