From: <ama...@us...> - 2006-07-23 18:02:07
|
Revision: 7112 Author: amaxwell Date: 2006-07-23 11:02:05 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/bibdesk/?rev=7112&view=rev Log Message: ----------- fix method signatures, re-add assertion to prevent crash Modified Paths: -------------- trunk/bibdesk/BDSKSheetController.m trunk/bibdesk/BibDocument.m Modified: trunk/bibdesk/BDSKSheetController.m =================================================================== --- trunk/bibdesk/BDSKSheetController.m 2006-07-23 17:57:09 UTC (rev 7111) +++ trunk/bibdesk/BDSKSheetController.m 2006-07-23 18:02:05 UTC (rev 7112) @@ -103,7 +103,7 @@ [NSApp beginSheet:[self window] modalForWindow:window modalDelegate:self - didEndSelector:@selector(didEndAlert:returnCode:contextInfo:) + didEndSelector:@selector(didEndSheet:returnCode:contextInfo:) contextInfo:NULL]; int returnCode = [NSApp runModalForWindow:[self window]]; [self endSheetWithReturnCode:returnCode]; @@ -127,6 +127,7 @@ - (void)didEndSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { if(theModalDelegate != nil && theDidEndSelector != NULL){ NSMethodSignature *signature = [theModalDelegate methodSignatureForSelector:theDidEndSelector]; + NSAssert2(nil != signature, @"%@ does not implement %@", theModalDelegate, NSStringFromSelector(theDidEndSelector)); NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature]; [invocation setSelector:theDidEndSelector]; [invocation setArgument:&self atIndex:2]; @@ -142,6 +143,7 @@ if(theModalDelegate != nil && theDidDismissSelector != NULL){ NSMethodSignature *signature = [theModalDelegate methodSignatureForSelector:theDidDismissSelector]; + NSAssert2(nil != signature, @"%@ does not implement %@", theModalDelegate, NSStringFromSelector(theDidDismissSelector)); NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature]; [invocation setSelector:theDidDismissSelector]; [invocation setArgument:&self atIndex:2]; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2006-07-23 17:57:09 UTC (rev 7111) +++ trunk/bibdesk/BibDocument.m 2006-07-23 18:02:05 UTC (rev 7112) @@ -3880,7 +3880,7 @@ [alert beginSheetModalForWindow:documentWindow modalDelegate:self didEndSelector:NULL - didDismissSelector:@selector(consolidateSheetDidEnd:returnCode:contextInfo:) + didDismissSelector:@selector(consolidateAlertDidEnd:returnCode:contextInfo:) contextInfo:NULL]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |