Continuation of last Commit. Just trying to get Xcode and Git to cooperate.

Author: jerrykrinock

SSYLazyView.h

@@ -48,7 +48,10 @@ extern NSString* SSYLazyViewDidLoadPayloadNotification;
  
  @details  When the receiver loads its nib as a result of being moved to a
  window, the window controller of the window to which it was moved is assigned
- as the file's owner of the nib.
+ as the file's owner of the nib.  This will cause it to receive -awakeFromNib,
+ which has probably happened already.  Therefore, such a window controller's
+ -awakeFromNib method typically needs a lockout to prevent it from running more
+ than once in an instance.
  
  In the Xcode xib editor, you may have one or more initial placeholder subviews
  in your Lazy View.  For example, you may place a text field with large

SSYMOCManager.h

@@ -78,6 +78,9 @@
  If you do not wish to support multi-hop migration, you may pass nil
  and only Core Data's built-in single-hop automatic migration will
  be used.  For store types other than sqlite, this parameter is ignored.
+ @param    useLegacyRollbackJournaling.  See Apple WWDC 2013 Session 207,
+ "What's New in Core Data and iCloud", 40:00 - 48:00.  Ignored if storeType
+ is not NSSQLiteStoreType.
  @param    error_p  If managed object context could not be created, points to an NSError
  on output. This should not occur for NSInMemoryStoreType, only NSSQLiteStoreType.
  @result   The new or pre-existing managed object context, or nil if one could not be created.
@@ -86,6 +89,7 @@
 											  owner:(id)owner
 										 identifier:(NSString*)identifier
 										   momdName:(NSString*)momdName
+                        useLegacyRollbackJournaling:(BOOL)useLegacyRollbackJournaling
 											error_p:(NSError**)error_p ;
 
 /*!
@@ -96,10 +100,12 @@
  for the managed objects.
  
  This method retains the -document parameter until it receives a corresponding
- +destroyManagedObjectContext message, so be careful or you will create retain cycles.
- This method will, however, *replace* its record for a particular document if you later
- send this message again for the same document with a new or same managedObjectContext.
- @param    document  The document which owns the managed object context
+ +destroyManagedObjectContext message, so be careful or you will create retain
+ cycles.  This method will, however, *replace* its record for a particular
+ document if you later send this message again for the same document with a new
+ or same managedObjectContext.
+ @param    document  The document which will own the managed object context
+ 
  @param    managedObjectContext  The managed object context to be registered.
 */
 + (void)registerOwnerDocument:(NSPersistentDocument*)document

SSYMOCManager.m

@@ -12,6 +12,7 @@
 #import "BkmxBasis.h"
 #import "NSBundle+SSYMotherApp.h"
 #import "NSBundle+MainApp.h"
+#import "NSDictionary+SimpleMutations.h"
 
 
 NSString* const constKeyMOC = @"moc" ;
@@ -140,6 +141,7 @@ + (BOOL)sqliteStoreExistsForIdentifier:(NSString*)identifier {
 + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)storeType
 													 identifier:(NSString*)identifier
 													   momdName:(NSString*)momdName
+                                                        options:(NSDictionary*)options
 														error_p:(NSError**)error_p {
 	NSPersistentStore* persistentStore = nil ;
 
@@ -196,26 +198,30 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 		}
 
 		if (ok) {
-			NSDictionary* options ;
-		   if (momdName) {
+            if (momdName) {
 			   // Using Multi-Hop Migration
 			   ok = [SSYPersistentDocumentMultiMigrator migrateIfNeededStoreAtUrl:url
-																	 storeOptions:nil
+																	 storeOptions:options
 																		storeType:NSSQLiteStoreType
 																		 momdName:momdName
 																		 document:nil
 																		  error_p:error_p] ;
-			   options = nil ;
 		   }
 		   else {
 			   // Using Core Data's built-in Single-Hop Migration only
-			   options = [NSDictionary dictionaryWithObjectsAndKeys:
-						  [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
-						  nil] ;
+               NSDictionary* moreOption = [NSDictionary dictionaryWithObjectsAndKeys:
+                                           [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
+                                           nil] ;
+               if (options) {
+                   options = [options dictionaryByAddingEntriesFromDictionary:moreOption] ;
+               }
+               else {
+                   options = moreOption ;
+               }
 		   }
 
 		   if (ok) {
-			   // Add persistent store to it
+               // Add persistent store to it
 			   persistentStore = [newPSC addPersistentStoreWithType:NSSQLiteStoreType
 													  configuration:nil
 																URL:url
@@ -282,7 +288,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 	   persistentStore = [newPSC addPersistentStoreWithType:NSInMemoryStoreType
 											  configuration:nil
 														URL:nil
-													options:nil
+													options:options
 													  error:error_p] ;
 
 	   if (!persistentStore) {
@@ -304,6 +310,7 @@ - (NSManagedObjectContext*)managedObjectContextType:(NSString*)type
 											  owner:(id)owner_
 										 identifier:(NSString*)identifier
 										   momdName:(NSString*)momdName
+                                            options:(NSDictionary*)options
 											error_p:(NSError**)error_p {
 	NSManagedObjectContext* managedObjectContext = nil ;
     NSMutableDictionary* mocDics = nil ;
@@ -325,6 +332,7 @@ - (NSManagedObjectContext*)managedObjectContextType:(NSString*)type
 		NSPersistentStoreCoordinator* coordinator = [[self class] persistentStoreCoordinatorType:type
 																					  identifier:identifier
 																						momdName:momdName
+                                                                                         options:options
 																						 error_p:error_p] ;
 		if (coordinator) {
             managedObjectContext = [[NSManagedObjectContext alloc] init] ;
@@ -469,11 +477,25 @@ + (NSManagedObjectContext*)managedObjectContextType:(NSString*)type
 											  owner:(id)owner
 										 identifier:(NSString*)identifier
 										   momdName:(NSString*)momdName
+                        useLegacyRollbackJournaling:(BOOL)useLegacyRollbackJournaling
 											error_p:(NSError**)error_p {
+    NSDictionary* options = nil ;
+    if ([type isEqualToString:NSSQLiteStoreType]) {
+        if (useLegacyRollbackJournaling) {
+            NSDictionary* sqlitePragmas = [NSDictionary dictionaryWithObjectsAndKeys:
+                                           @"DELETE", @"journal_mode",
+                                           nil] ;
+            options = [NSDictionary dictionaryWithObjectsAndKeys:
+                       sqlitePragmas, NSSQLitePragmasOption,
+                       nil] ;
+        }
+    }
+
 	NSManagedObjectContext* moc = [[self sharedMOCManager] managedObjectContextType:type
 																			  owner:owner
 																		 identifier:identifier
 																		   momdName:momdName
+                                                                            options:options
 																			error_p:error_p] ;
 	return moc ;
 }
@@ -551,6 +573,6 @@ + (void)logDebugCurrentSqliteMocs {
 @end
 
 // Note 1.
-// Because our method +persistentStoreCoordinatorType:identifier:momdName:error_p: always creates
+// Because our method +persistentStoreCoordinatorType:identifier:momdName:options:error_p: always creates
 // a new persistent store coordinator and always adds exactly one persistent
 // store to it, we can just grab its first (and only) store.

SSYManagedObject.m

@@ -6,6 +6,7 @@
 #import "NSDocument+SyncModDate.h"
 #import "NSObject+MoreDescriptions.h"
 #import "NSBundle+MainApp.h"
+#import "NSEntityDescription+SSYMavericksBugFix.h"
 
 // Public Notifications
 NSString* const constNoteWillUpdateObject = @"willUpdateObject" ;
@@ -125,16 +126,20 @@ + (NSString*)entityNameForClass:(Class)class {
 }
 
 + (NSEntityDescription*)entityDescription {
+    // This method was rewritten for BookMacster 1.19.2, to work around a
+    // bug in Mac OS X 10.9.  See
+    // http://stackoverflow.com/questions/19626858/over-optimization-bug-in-10-9-core-data-entity-description-methods
+    
 	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainAppBundle]] ;
 	NSManagedObjectModel* mom = [NSManagedObjectModel mergedModelFromBundles:bundles] ;
-	NSPersistentStoreCoordinator* psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:mom] ;
-	NSManagedObjectContext* moc = [[NSManagedObjectContext alloc] init] ;
-	[moc setPersistentStoreCoordinator:psc] ;
-	[psc release] ;
-	NSEntityDescription* entityDescription = [NSEntityDescription entityForName:[self entityNameForClass:self]
-														 inManagedObjectContext:moc] ;
-	[moc release] ;
-	
+    NSString* entityName = [self entityNameForClass:self] ;
+    NSDictionary* entities = [[NSDictionary alloc] initWithDictionary:[mom entitiesByName]] ;
+    NSEntityDescription* entityDescription = [entities objectForKey:entityName] ;
+    if (!entityDescription) {
+        NSLog(@"Internal Error 561-3831 for %@", entityName) ;
+    }
+    [entities release] ;
+    
 	return entityDescription ;
 }
 
@@ -164,8 +169,8 @@ - (BOOL)validateForInsert:(NSError **)error {
 			}
 			
 			NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init] ;
-			[fetchRequest setEntity:[NSEntityDescription entityForName:[[self entity] name]  
-												inManagedObjectContext:managedObjectContext]] ;
+			[fetchRequest setEntity:[NSEntityDescription SSY_entityForName:[[self entity] name]
+											    	inManagedObjectContext:managedObjectContext]] ;
 			[fetchRequest setPredicate:[NSPredicate predicateWithFormat:@"(%K == %@) AND (SELF != %@)",
 				uniqueAttributeKey, uniqueAttributeValue, self]] ;
 			NSArray* conflictingObjects = [managedObjectContext executeFetchRequest:fetchRequest
@@ -357,8 +362,8 @@ - (void)logChangesForAllManagedObjectsInSameContext {
 	NSArray* entityNames = [[[[moc persistentStoreCoordinator] managedObjectModel] entities] valueForKey:@"name"] ;
 	NSUInteger nObjects = 0, nChanged = 0 ;
 	for (NSString* entityName in entityNames) {
-		NSEntityDescription* entity = [NSEntityDescription entityForName:entityName
-												  inManagedObjectContext:moc] ;
+		NSEntityDescription* entity = [NSEntityDescription SSY_entityForName:entityName
+                                                      inManagedObjectContext:moc] ;
 		[fetchRequest setEntity:entity] ;
 		NSArray* objects = [moc executeFetchRequest:fetchRequest
 											  error:&error_] ;

SSYMojo.m

@@ -4,10 +4,12 @@
 #import "SSYAlert.h"
 #import "NSManagedObjectContext+Cheats.h"
 #import "NSObject+MoreDescriptions.h"
+#import "NSEntityDescription+SSYMavericksBugFix.h"
 
 // For debugging
 
 
+
 @implementation SSYMojo
 
 @synthesize managedObjectContext = m_managedObjectContext ;
@@ -68,8 +70,8 @@ - (NSArray*)objectsWithSubpredicates:(NSArray*)subpredicates
 	NSManagedObjectContext* managedObjectContext = [self managedObjectContext] ;
 	NSArray* fetches = nil ;
 	if (managedObjectContext) {
-		[fetchRequest setEntity:[NSEntityDescription entityForName:[self entityName]  
-											inManagedObjectContext:managedObjectContext]] ;
+		[fetchRequest setEntity:[NSEntityDescription SSY_entityForName:[self entityName]
+                                                inManagedObjectContext:managedObjectContext]] ;
 		if (compoundPredicate) {
 			[fetchRequest setPredicate:compoundPredicate] ;
 		}
@@ -154,8 +156,8 @@ - (NSArray*)allObjectsError_p:(NSError**)error_p {
 	// when it invoked -[NSArrayController removeSelectionIndexes:[self selectionIndexes]] ;
 	// [managedObjectContext processPendingChanges] ;  // Do not do this
 
-	NSEntityDescription* entity = [NSEntityDescription entityForName:[self entityName]
-                                              inManagedObjectContext:managedObjectContext] ;
+	NSEntityDescription* entity = [NSEntityDescription SSY_entityForName:[self entityName]
+                                                  inManagedObjectContext:managedObjectContext] ;
     NSArray* allObjects ;
     if (entity) {
         [fetchRequest setEntity:entity] ;

SSYShellTasker.h

@@ -8,9 +8,14 @@ __attribute__((visibility("default"))) @interface SSYShellTasker : NSObject {
 /*!
  @brief    A wrapper around NSTask to launch a command-line process, with a timeout.
 
- @details  Only use this function after you have searched far and wide for a Cocoa, CoreFoundation,
- Carbon, or any built-in API to do what you want to do.    That is because this function will spawn
- another process which often leads to trouble.    Use it sparingly.   Examine the return value,
+ @details  TODO: This method will fail due to clogged pipe if the stdout
+ or stderr data is too long.  To fix that, incorporate the incremental pipe
+ emptying as demonstrated in my other class, SSYTasker.  Note that this
+ method does stuff that SSYTasker does not, such as timeout.
+ 
+ Only use this function after you have searched far and wide for a Cocoa, CoreFoundation,
+ Carbon, or any built-in API to do what you want to do.   That is because this function will spawn
+ another process which often leads to trouble.    Use it sparingly.  Examine the return value,
  stdout_p and stderr_p and write code to recover from errors. 
  
  TIMEOUT   Narrated result       result     *stdoutData_p    *stderrData_p    *error_p  

SSYSizeFixxerSubview.h

@@ -12,4 +12,21 @@
 @interface SSYSizeFixxerSubview : NSView {
 }
 
+/*
+ @brief    Searches a given array of subviews and extracts (see details), if
+ any, the size of any SSYSizeFixxerSubview found within it, and returns it,
+ or if no such SSYSizeFixxerSubview is found, returns a given default size.
+ 
+ @details  If any of the elements of the given subviews is an
+ SSYSizeFixxerSubview, returns the size of the first one.  Otherwise, if the
+ given subviews contains only one element, which responds to -suviews, searches
+ its subviews and returns the size of the first one.  The latter condition is
+ to support configurations where a view may be the only view embedded in
+ another view, as will occur with, for example, SSYLazyView.
+
+ @param    defaultSize  This is typically used as a debugging aid, or for
+ defensive programming.
+ */
++ (NSSize)fixedSizeAmongSubviews:(NSArray*)subviews
+                     defaultSize:(NSSize)defaultSize ;
 @end

SSYSizeFixxerSubview.m

@@ -3,4 +3,49 @@
 
 @implementation SSYSizeFixxerSubview
 
+
++ (BOOL)shallowlyGetFixedSize_p:(NSSize *)size_p
+                    defaultSize:(NSSize)defaultSize
+                   fromSubviews:(NSArray *)subviews {
+	// Set a large default fixed size for defensive programming
+    *size_p = defaultSize ;
+	
+	// Set to the size of the Size Fixxer Subview
+	BOOL didFindSSYSizeFixxerSubview = NO ;
+	for (NSView* subview in subviews) {
+		if ([subview isKindOfClass:[SSYSizeFixxerSubview class]]) {
+			*size_p = [subview frame].size ;
+			didFindSSYSizeFixxerSubview = YES ;
+			break ;
+		}
+	}
+    
+    return didFindSSYSizeFixxerSubview ;
+}
+
++ (NSSize)fixedSizeAmongSubviews:(NSArray *)subviews
+                     defaultSize:(NSSize)defaultSize {
+    NSSize size;
+    BOOL didFindSSYSizeFixxerSubview = [self shallowlyGetFixedSize_p:&size
+                                                         defaultSize:defaultSize
+                                                        fromSubviews:subviews] ;
+	
+	if (!didFindSSYSizeFixxerSubview) {
+		if ([subviews count] == 1) {
+            // The subview is a thin wrapper around another view.
+            NSView* innerView = [subviews objectAtIndex:0] ;
+            NSArray* innerSubviews = [innerView subviews] ;
+            didFindSSYSizeFixxerSubview = [self shallowlyGetFixedSize_p:&size
+                                                            defaultSize:defaultSize
+                                                           fromSubviews:innerSubviews] ;
+        }
+	}
+    
+	if (!didFindSSYSizeFixxerSubview) {
+		// This will occur for the two spacers, NSToolbarFlexibleSpaceItem
+	}
+    
+    return size ;
+}
+
 @end

SSYTempWindowController.h

@@ -6,17 +6,20 @@
  instance in the application.
 
  @details  An instance of this object is allocated when required, observes
- NSWindowWillCloseNotification, and releases itself when it receives notification
- that its window is closing.
+ NSWindowWillCloseNotification, and releases itself when it receives
+ notification that its window is closing.
+ 
+ For a cleaner approach to this problem, which does not require subclassing,
+ see [SSYWindowHangout hungOutWindowControllerOfClass:].
 */
 @interface SSYTempWindowController : NSWindowController {
 }
 
 /*!
  @brief    Returns the name of the nib file containing the receiver's window.
 
- @details  Subclasses must implement.  Simply return an NSString constant. 
- Default implementation logs an internal error and returns nil. 
+ @details  Subclasses must implement.  Simply return an NSString constant.
+ Default implementation logs an internal error and returns nil.  
  
  In this nib,
  *  File's Owner should be set to your subclass of this class

SSYTokenFieldCell.m

@@ -12,9 +12,17 @@ - (void)setObjectValue:(id)value {
 		// Convert to an NSArray, as required by super
 		value = [value allObjects] ;
 
-        // The following line was added in BookMacster 1.12.7, to
-        // alphabetize tags in Detail View (littleCloud) and Inspector
-		value = [[(NSCountedSet*)value allObjects] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)] ;
+        /*
+         The following line was added in BookMacster 1.12.7, to alphabetize
+         tags in Detail View (littleCloud) and Inspector.  However, it also
+         cast 'value' to an NSCountedSet and re-invoked -allObjects on it.
+         This *worked* in Mac OS X 10.7 and later, because, strangely, NSArray
+         *does* respond to -allObjects in these systems, returns a copy of self.
+         But not in 10.6, where an exception could be raised here
+         The troublesome cast and -allObjects were removed in 
+         BookMacster 1.19.2.
+         */
+		value = [value sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)] ;
 	}
 
 	[super setObjectValue:value] ;