Shipped BookMacster 1.19

Author: jerrykrinock

SSYAlert.h

@@ -61,6 +61,23 @@ extern NSString* const SSYAlert_ErrorSupportEmailKey ;
 */
 extern NSString* const SSYAlertDidProcessErrorNotification ;
 
+/*!
+ @brief    The subclass of NSWindow created by SSYAlert.  The interface
+ is exposed so that you can get the checkbox state after an SSYAlert is closed,
+ without setting shouldStickAround to YES
+ 
+ @details  Typically, in a -didEndSheet:returnCode:contextInfo: callback
+ on a sheet whose window controller is an SSYAlert alert, the SSYAlert may
+ already be gone and [sheet windowController] will return nil.  So you can't
+ get control values from the window controller.  This class allows you to get
+ control states from the window directly.
+ */
+@interface SSYAlertWindow : NSWindow
+
+- (NSInteger)checkboxState ;
+
+@end
+
 /*!
  @brief    The SSYErrorRecoveryAttempting informal protocol is a 
  replacement for Cocoa's NSErrorRecoveryAttempting informal protocol
@@ -921,19 +938,6 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
 - (void)addOtherSubview:(NSView*)subview
 				atIndex:(NSInteger)index ;
 
-/*!
- @brief    Removes the "other subview" with a given index
- from the receiver.
-
- @details  The index must exist or an exception will be raised.
- @param    index  The index of the "other subview" to be removed.
-*/
-- (void)removeOtherSubviewAtIndex:(NSInteger)index ;
-
-/*!
- @brief    Removes all of the <i>other subviews</i> from the receiver.
-*/
-- (void)removeAllOtherSubviews ;
 
 /*!
  @brief    Returns a text view which looks like the receiver's 

SSYAlert.m

@@ -185,10 +185,6 @@ @interface SSYAlert ()
 @end
 
 
-@interface SSYAlertWindow : NSWindow
-
-@end
-
 @implementation SSYAlertWindow
 
 /*!
@@ -243,7 +239,26 @@ - (void)setFrameOrigin:(NSPoint)frameOrigin {
 	}
 }
 
-#pragma mark * 
+- (NSInteger)checkboxState {
+    NSInteger state = NSMixedState ; // default answer in case we can't find checkbox
+    BOOL didFindCheckbox = NO ;
+    for (NSView* view in [[self contentView] subviews]) {
+        if ([view isKindOfClass:[SSYWrappingCheckbox class]]) {
+            SSYWrappingCheckbox* checkbox = (SSYWrappingCheckbox*)view ;
+            state = [checkbox state] ;
+            didFindCheckbox = YES ;
+            break ;
+        }
+    }
+    
+    if (!didFindCheckbox) {
+        NSLog(@"Internal Error 624-9382 %@ %@", [self title], [[self contentView] subviews]) ;
+    }
+    
+    return state ;
+}
+
+#pragma mark *
 
 // At one time, I thought that NSWindow's keyboard loop was
 // broken in a programmatically-created window.
@@ -841,48 +856,6 @@ - (void)setSupportEmail {
 	}
 }
 
-//#define DEFAULT_MIN_TEXT_FIELD_WIDTH 250.0
-- (void)cleanSlate {
-	[self setWindowTitle:nil] ; // Defaults to mainBundle's CFBundleName (which should be the localized name of the app)
-	[self setShowsProgressBar:NO] ;
-	[self setTitleText:nil] ;
-	[self setSmallText:nil] ;
-	[self setIconStyle:SSYAlertIconNoIcon] ;
-	[self setButton1Title:nil] ;
-	[self setButton2Title:nil] ;
-	[self setButton3Title:nil] ;
-	[self setHelpAnchor:nil] ;
-	[self setCheckboxTitle:nil] ;
-	[self setWhyDisabled:nil] ;
-	[self removeAllOtherSubviews] ;
-
-	// The following is a holdover from when SSYAlert support a
-	// configuration stack, and may no longer be needed...
-	// Now, there may still be some subviews left in the view...
-	// The -removeAllOtherSubviews only removed those which are in
-	// the current self.otherSubviews array.  But if the configuration has
-	// been pushed, self.otherSubviews will be a new, empty array.
-	// Therefore, we now ask the -contentView if it has any more subviews
-	// left and if so remove them...
-	NSView* contentView = [[self window] contentView] ;
-	// We use a regular C loop since -removeFromSuperviewWithoutNeedingDisplay
-	// mutates the [contentView subviews] and therefore we cannot 
-	// use an enumeration
-	NSArray* subviews = [contentView subviews] ;
-	NSInteger i ;
-	for (i=[subviews count]-1; i>=0; i--) {
-		NSView* subview = [subviews objectAtIndex:i] ;
-		[subview removeFromSuperviewWithoutNeedingDisplay] ;
-	}
-	
-	self.allowsShrinking = YES ;
-	[self setIsEnabled:YES] ;
-	self.isVisible = YES ;
-	self.progressBarShouldAnimate = NO ;
-	[self setRightColumnMinimumWidth:0.0] ;
-	[self setRightColumnMaximumWidth:CGFLOAT_MAX] ;
-}
-
 - (void)setWindowTitle:(NSString*)title {
 	if (!title) {
 		title = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ; // CFBundleName may be localized
@@ -1200,6 +1173,48 @@ - (void)setCheckboxState:(NSCellStateValue)state {
 	[[self checkbox] setState:state] ;
 }
 
+//#define DEFAULT_MIN_TEXT_FIELD_WIDTH 250.0
+- (void)cleanSlate {
+	[self setWindowTitle:nil] ; // Defaults to mainBundle's CFBundleName (which should be the localized name of the app)
+	[self setShowsProgressBar:NO] ;
+	[self setTitleText:nil] ;
+	[self setSmallText:nil] ;
+	[self setIconStyle:SSYAlertIconNoIcon] ;
+	[self setButton1Title:nil] ;
+	[self setButton2Title:nil] ;
+	[self setButton3Title:nil] ;
+	[self setHelpAnchor:nil] ;
+	[self setCheckboxTitle:nil] ;
+	[self setWhyDisabled:nil] ;
+	[self removeAllOtherSubviews] ;
+    
+	// The following is a holdover from when SSYAlert support a
+	// configuration stack, and may no longer be needed...
+	// Now, there may still be some subviews left in the view...
+	// The -removeAllOtherSubviews only removed those which are in
+	// the current self.otherSubviews array.  But if the configuration has
+	// been pushed, self.otherSubviews will be a new, empty array.
+	// Therefore, we now ask the -contentView if it has any more subviews
+	// left and if so remove them...
+	NSView* contentView = [[self window] contentView] ;
+	// We use a regular C loop since -removeFromSuperviewWithoutNeedingDisplay
+	// mutates the [contentView subviews] and therefore we cannot
+	// use an enumeration
+	NSArray* subviews = [contentView subviews] ;
+	NSInteger i ;
+	for (i=[subviews count]-1; i>=0; i--) {
+		NSView* subview = [subviews objectAtIndex:i] ;
+		[subview removeFromSuperviewWithoutNeedingDisplay] ;
+	}
+	
+	self.allowsShrinking = YES ;
+	[self setIsEnabled:YES] ;
+	self.isVisible = YES ;
+	self.progressBarShouldAnimate = NO ;
+	[self setRightColumnMinimumWidth:0.0] ;
+	[self setRightColumnMaximumWidth:CGFLOAT_MAX] ;
+}
+
 #pragma mark * Public Methods for Displaying and Running
 
 - (void)errorSheetDidEnd:(NSWindow *)sheet

SSYDebug.m

@@ -1,4 +1,3 @@
-#import "SSYDebug.h"
 #import <execinfo.h>
 #import <mach-o/dyld.h>
 

SSYInterappServer.m

@@ -144,6 +144,7 @@ - (id)initWithPortName:(NSString*)portName
 											  SSYInterappServerCallBackCreateData,
 											  &context,
 											  NULL) ;
+            
 			if (m_port) {
 				[self setDelegate:delegate] ;
 				CFRunLoopSourceRef source = CFMessagePortCreateRunLoopSource(
@@ -177,7 +178,7 @@ - (id)initWithPortName:(NSString*)portName
 			*error_p = [NSError errorWithDomain:SSYInterappServerErrorDomain
 										   code:errorCode
 									   userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
-												 @"Could not initialize server", NSLocalizedDescriptionKey,
+												 @"Mac OS X failed to create a local message port.", NSLocalizedDescriptionKey,
 												 portName, @"Port Name",
 												 nil]] ;
 		}
@@ -221,8 +222,9 @@ + (SSYInterappServer*)leaseServerWithPortName:(NSString*)portName
 		}
 		else {
 			// When testing, I got a crash of BookMacster-Worker here because
-			// server was nil.  Maybe the port was already in use?
-			NSLog(@"Internal Error 713-0192 %@ %@ %@ del=%@", portName, static_serversInUse, error, delegate) ;
+			// server was nil.  Until BookMacster 1.19, I logged
+            // Internal Error 713-0192 here, but it was not providing any
+            // useful information not already in the error.
 		}
 		[server release] ;
 	}

SSYLabelledTextField.h

@@ -18,6 +18,7 @@
 	NSWindowController* windowController ;  // Documentation explains why this kludge is necessary
 	id validationObject ;
 	NSString* errorMessage ;
+    NSInteger m_tag ;
 }
 
 @property (retain) NSTextField* keyField ;
@@ -26,6 +27,7 @@
 @property (retain) id windowController ;
 @property (retain) id validationObject ;
 @property (retain) NSString* errorMessage ;
+@property (assign) NSInteger tag ;
 
 /*!
  @brief    Convenience method for getting an autoreleased instance of this class.
@@ -83,6 +85,7 @@
 									displayedKey:(NSString*)displayedKey
 								  displayedValue:(NSString*)displayedValue
 										editable:(BOOL)editable
+                                             tag:(NSInteger)tag
 									errorMessage:(NSString*)errorMessage ;
 
 /*!

SSYLabelledTextField.m

@@ -9,6 +9,7 @@
 NSString* const constKeyValidationObject = @"ValidationObject" ;
 NSString* const constKeyWindowController = @"WindowController" ;
 NSString* const constKeyErrorMessage = @"ErrorMessage" ;
+NSString* const constKeyTextFieldTag = @"tag" ;
 
 
 @interface NSWindowController (Disableable) 
@@ -26,6 +27,7 @@ @implementation SSYLabelledTextField
 @synthesize validationObject ;
 @synthesize windowController ;
 @synthesize errorMessage ;
+@synthesize tag = m_tag ;
 
 - (void)setStringValue:(NSString*)stringValue {
 	[[self valueField] setStringValue:stringValue] ;
@@ -70,6 +72,7 @@ - (id)initAsSecure:(BOOL)secure
 	  displayedKey:(NSString*)displayedKey
 	displayedValue:(NSString*)displayedValue
 		  editable:(BOOL)editable_
+               tag:(NSInteger)tag
 	  errorMessage:(NSString*)errorMessage_ {
 	self = [super initWithFrame:NSZeroRect];
 	if (self != nil) {
@@ -129,6 +132,7 @@ - (id)initAsSecure:(BOOL)secure
 		}
 		[[self valueField] setEditable:editable_] ;
 		[self setErrorMessage:errorMessage_] ;
+        [self setTag:tag] ;
 
 		// The following is needed in the usual case where, upon initialization,
 		// the initial value of @"" is invalid.  We need to send validation
@@ -145,13 +149,16 @@ + (SSYLabelledTextField*)labelledTextFieldSecure:(BOOL)secure
 									displayedKey:(NSString*)displayedKey
 								  displayedValue:(NSString*)displayedValue
 										editable:(BOOL)editable
+                                             tag:(NSInteger)tag
 									errorMessage:(NSString*)errorMessage {
 	SSYLabelledTextField* instance = [[SSYLabelledTextField alloc] initAsSecure:secure
 															 validationSelector:validationSelector
 															   validationObject:validationObject
 															   windowController:windowController
 																   displayedKey:displayedKey
-																 displayedValue:displayedValue																	   editable:editable
+																 displayedValue:displayedValue
+                                                                       editable:editable
+                                                                            tag:tag
 																   errorMessage:errorMessage] ;
 	return [instance autorelease] ;
 }
@@ -178,7 +185,12 @@ - (NSString*)description {
 	NSMutableDictionary* dic = [NSMutableDictionary dictionaryWithDictionary:dictionary] ;
 	[dic setValue:NSStringFromSelector([self validationSelector])
 		   forKey:@"validationSelector"] ;
-	return [dic description] ;
+    [dic setValue:[NSNumber numberWithInteger:[self tag]]
+           forKey:@"tag"] ;
+	return [NSString stringWithFormat:
+            @"%@ %@",
+            [super description],
+            [dic description]] ;
 }
 
 - (void)sizeHeightToFitAllowShrinking:(BOOL)allowShrinking {
@@ -246,6 +258,7 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:validationObject forKey:constKeyValidationObject] ;
 	[coder encodeObject:windowController forKey:constKeyWindowController] ;
     [coder encodeObject:errorMessage forKey:constKeyErrorMessage] ;
+    [coder encodeInteger:m_tag forKey:constKeyTextFieldTag] ;
 }
 
 - (id)initWithCoder:(NSCoder *)coder {
@@ -257,6 +270,7 @@ - (id)initWithCoder:(NSCoder *)coder {
 	validationObject = [[coder decodeObjectForKey:constKeyValidationObject] retain] ;
 	windowController = [[coder decodeObjectForKey:constKeyWindowController] retain] ;
 	errorMessage = [[coder decodeObjectForKey:constKeyErrorMessage] retain] ;
+    m_tag = [coder decodeIntegerForKey:constKeyTextFieldTag] ;
 
 	return self ;
 }

SSYMOCManager.h

@@ -13,6 +13,9 @@
  which the owner is desired turns out to not be one of this class's creations.
  This class itself is instantiated as an app-wide
  singleton and no public instance methods are available.
+ 
+ When using this class, [NSApp delegate] must conform to protocol 
+ SSYAppSupporter.
  */
 @interface SSYMOCManager : NSObject {
 	NSMutableDictionary* inMemoryMOCDics ;