Rework alert sheets:

 - Change MCPConnection.m to no longer use a reference to tableWindow to attach sheets - instead use a delate error display method if available
 - Rework TableSource and TableContent sheetDidEnd methods into per-task methods rather than overloading contextInfo
 - Rework SPAlertSheets to perform actions on the main thread, with the loss of (unused) support for a didDismissSelector.  This addresses a number of crashes logged by the crash reporter

1 files changed, 13 insertions, 13 deletions

diff --git a/Source/TableDump.m b/Source/TableDump.m
index 004a8e61..6dd3833c 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -324,7 +324,7 @@
 	if ( [[NSFileManager defaultManager] fileExistsAtPath:exportFile] ) {
 		if ( ![[NSFileManager defaultManager] isWritableFileAtPath:exportFile]
 			|| !(fileHandle = [SPFileHandle fileHandleForWritingAtPath:exportFile]) ) {
-			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
+			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil,
 							  NSLocalizedString(@"Couldn't replace the file. Be sure that you have the necessary privileges.", @"message of panel when file cannot be replaced"));
 			[pool release];
 			return;
@@ -333,7 +333,7 @@
 	// Otherwise attempt to create a file
 	} else {
 		if ( ![[NSFileManager defaultManager] createFileAtPath:exportFile contents:[NSData data] attributes:nil] ) {
-			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
+			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil,
 							  NSLocalizedString(@"Couldn't write to file. Be sure that you have the necessary privileges.", @"message of panel when file cannot be written"));
 			[pool release];
 			return;
@@ -343,7 +343,7 @@
 		fileHandle = [SPFileHandle fileHandleForWritingAtPath:exportFile];
 		if ( !fileHandle ) {
 			[[NSFileManager defaultManager] removeFileAtPath:exportFile handler:nil];
-			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
+			SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil,
 							  NSLocalizedString(@"Couldn't write to file. Be sure that you have the necessary privileges.", @"message of panel when file cannot be written"));
 			[pool release];
 			return;
@@ -474,7 +474,7 @@
 
 	// Display error message on problems
 	if ( !progressCancelled && !success ) {
-		SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil,
+		SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil,
 						  NSLocalizedString(@"Couldn't write to file. Be sure that you have the necessary privileges.", @"message of panel when file cannot be written"));
 	}
 
@@ -623,7 +623,7 @@
 	if (!sqlFileHandle) {
 		SPBeginAlertSheet(NSLocalizedString(@"Import Error title", @"Import Error"),
 						  NSLocalizedString(@"OK button label", @"OK button"),
-						  nil, nil, tableWindow, self, nil, nil, nil,
+						  nil, nil, tableWindow, self, nil, nil,
 						  NSLocalizedString(@"SQL file open error", @"The SQL file you selected could not be found or read."));
 		if([filename hasPrefix:SPImportClipboardTempFileNamePrefix])
 			[[NSFileManager defaultManager] removeItemAtPath:filename error:nil];
@@ -667,7 +667,7 @@
 			[self closeAndStopProgressSheet];
 			SPBeginAlertSheet(NSLocalizedString(@"SQL read error title", @"File read error"),
 							  NSLocalizedString(@"OK", @"OK button"),
-							  nil, nil, tableWindow, self, nil, nil, nil,
+							  nil, nil, tableWindow, self, nil, nil,
 							  [NSString stringWithFormat:NSLocalizedString(@"SQL read error", @"An error occurred when reading the file.\n\nOnly %ld queries were executed.\n\n(%@)"), (long)queriesPerformed, [exception reason]]);
 			[sqlParser release];
 			[sqlDataBuffer release];
@@ -717,7 +717,7 @@
 						[self closeAndStopProgressSheet];
 						SPBeginAlertSheet(NSLocalizedString(@"SQL read error title", @"File read error"),
 										  NSLocalizedString(@"OK", @"OK button"),
-										  nil, nil, tableWindow, self, nil, nil, nil,
+										  nil, nil, tableWindow, self, nil, nil,
 										  [NSString stringWithFormat:NSLocalizedString(@"SQL encoding read error", @"An error occurred when reading the file, as it could not be read in either UTF-8 or %@.\n\nOnly %ld queries were executed."), [[tableDocumentInstance connectionEncoding] UTF8String], (long)queriesPerformed]);
 						[sqlParser release];
 						[sqlDataBuffer release];
@@ -886,7 +886,7 @@
 	if (!csvFileHandle) {
 		SPBeginAlertSheet(NSLocalizedString(@"Import Error title", @"Import Error"),
 						  NSLocalizedString(@"OK button label", @"OK button"),
-						  nil, nil, tableWindow, self, nil, nil, nil,
+						  nil, nil, tableWindow, self, nil, nil,
 						  NSLocalizedString(@"CSV file open error", @"The CSV file you selected could not be found or read."));
 		if([filename hasPrefix:SPImportClipboardTempFileNamePrefix])
 			[[NSFileManager defaultManager] removeItemAtPath:filename error:nil];
@@ -946,7 +946,7 @@
 			[self closeAndStopProgressSheet];
 			SPBeginAlertSheet(NSLocalizedString(@"CSV read error title", @"File read error"),
 							  NSLocalizedString(@"OK", @"OK button"),
-							  nil, nil, tableWindow, self, nil, nil, nil,
+							  nil, nil, tableWindow, self, nil, nil,
 							  [NSString stringWithFormat:NSLocalizedString(@"CSV read error", @"An error occurred when reading the file.\n\nOnly %ld rows were imported.\n\n(%@)"), (long)rowsImported, [exception reason]]);
 			[csvParser release];
 			[csvDataBuffer release];
@@ -995,7 +995,7 @@
 					[self closeAndStopProgressSheet];
 					SPBeginAlertSheet(NSLocalizedString(@"CSV read error title", @"File read error"),
 									  NSLocalizedString(@"OK", @"OK button"),
-									  nil, nil, tableWindow, self, nil, nil, nil,
+									  nil, nil, tableWindow, self, nil, nil,
 									  [NSString stringWithFormat:NSLocalizedString(@"CSV encoding read error", @"An error occurred when reading the file, as it could not be read using %@.\n\nOnly %ld rows were imported."), [[tableDocumentInstance connectionEncoding] UTF8String], (long)rowsImported]);
 					[csvParser release];
 					[csvDataBuffer release];
@@ -1380,7 +1380,7 @@
 						  NSLocalizedString(@"OK", @"OK button"),
 						  nil, nil,
 						  tableWindow, self,
-						  nil, nil, nil,
+						  nil, nil,
 						  NSLocalizedString(@"Could not parse file as CSV", @"Error when we can't parse/split file as CSV")
 						  );
 		return FALSE;
@@ -1393,7 +1393,7 @@
 						  NSLocalizedString(@"OK", @"OK button"),
 						  nil, nil,
 						  tableWindow, self,
-						  nil, nil, nil,
+						  nil, nil,
 						  NSLocalizedString(@"The CSV was read as containing more than 512 columns, more than the maximum columns permitted for speed reasons by Sequel Pro.\n\nThis usually happens due to errors reading the CSV; please double-check the CSV to be imported and the line endings and escape characters at the bottom of the CSV selection dialog.", @"Error when CSV appears to have too many columns to import, probably due to line ending mismatch")
 						  );
 		return FALSE;
@@ -1407,7 +1407,7 @@
 						  NSLocalizedString(@"OK", @"OK button"),
 						  nil, nil,
 						  tableWindow, self,
-						  nil, nil, nil,
+						  nil, nil,
 						  NSLocalizedString(@"Can't import CSV data into a database without any tables!", @"error text when trying to import csv data, but we have no tables in the db")
 						  );
 		return FALSE;