Before trying to add lastSaveHash

Author: jerrykrinock

SSYDocChildObject.h

@@ -6,6 +6,11 @@
 	BkmxDoc* m_document ; 
 }
 
+/*
+ @details  It is very important that someone counter this assignment by
+ sending us a setDocument:nil sometime between the time we find out that the
+ document is closing and the time that the document deallocs.
+ */
 - (id)initWithDocument:(BkmxDoc*)document ;
 
 // Weak reference, not retained, to avoid retain cycles

SSYDocChildObject.m

@@ -16,18 +16,6 @@ - (void)setDocument:(BkmxDoc *)document {
 	@synchronized(self) {
 		m_document = document ;
 	}
-
-	// During document opening, during -viewDidMoveToWindow, this class 
-	// will be sent an -initWithDocument: with argument nil.
-	// If that were passed to the following method as the object: argument,
-	// we would get notifications when ^any^ document closed.  We only
-	// want notifications when ^our^ document closes.  Thus, the following if()...
-	if (document != nil) {
-		[[NSNotificationCenter defaultCenter] addObserver:self
-												 selector:@selector(docWillClose:)
-													 name:SSYUndoManagerDocumentWillCloseNotification
-												   object:document] ;
-	}
 }
 
 - (id)initWithDocument:(BkmxDoc*)document_ {
@@ -40,18 +28,4 @@ - (id)initWithDocument:(BkmxDoc*)document_ {
 	return self;
 }
 
-- (void)dealloc {
-	
-	[super dealloc] ;
-}
-
-- (void)docWillClose:(NSNotification*)note {
-	[[NSNotificationCenter defaultCenter] removeObserver:self] ;
-
-	// To keep from crashing, in particular if I am a Broker, because
-	// my timers will keep invoking gotHeaders: and other methods
-	// which send messages to _doc as responses are received.
-	[self setDocument:nil] ;
-}
-
 @end

SSYManagedObject.h

@@ -118,9 +118,9 @@ extern NSString* const constKeyNewValue ;
  owns the receiver's managed object context
 
  @details  See +[SSYMOCManager ownerOfManagedObjectContext:] for exact search algorithm
- and definition of "owner".  Assuming that the owner must be of a specific type or
- conform to a certain formal protocol, it is recommended to override this method in
- subclasses.  Just invoke super, but return the required type.
+ and definition of "owner".  If the owner must be of a specific type or
+ conform to a certain formal protocol, you can re-declare and override this
+ method in subclasses.  The implementation simply returns super's owner.
  @result   The owner of the receiver
 */
 - (id)owner ;
@@ -215,13 +215,17 @@ extern NSString* const constKeyNewValue ;
 
 - (NSUInteger)countOfNonNilValues ;
 
+
 /*!
  @brief    A hash representing all relevant current property values of
  the receiver
 
  @details  The default implementation considers all attribute values to
  be relevant, and excludes all relationships.  Subclasses may override
  to exclude some attributes, or include some relationships, as desired. 
+ 
+ I don't use this implementation in BookMacster any more.  Instead, I have
+ tweaked implementations in two subclasses.
  */
 - (uint32_t)valuesHash ;
 

SSYOperationQueue.h

@@ -63,6 +63,7 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
 	id m_scriptResult ;
 	NSMutableArray* m_errorRetryInvocations ;
 	NSSet* m_skipOperationsExceptGroups ;
+    id m_noAppNapActivity ;
 }
 
 /*!
@@ -265,9 +266,9 @@ extern NSString* const SSYOperationQueueDidEndWorkNotification ;
  recovery option, you make the adjustments and, to repeat the operations,
  simply invoke the invocations in the array returned by this method.  
  However, you must grab this array during your isDoneSelector, because after
- your isDoneSelector returns, the array you get will be empty, as explained below.
- Typically, after grabbing this array you process the contents into a single
- invocation of invocations, and add the resulting "errorRetryInvocation"
+ your isDoneSelector returns, the array you get will be empty, as explained
+ below.  Typically, after grabbing this array you process the contents into a
+ single invocation of invocations, and add the resulting "errorRetryInvocation"
  to the -userInfo of your error object.
  
  After invoking your isDoneSelector, unless you passed keepWithNext:YES,

SSYOperationQueue.m

@@ -4,7 +4,7 @@
 #import "NSError+InfoAccess.h"
 #import "NSInvocation+Quick.h"
 #import "NSInvocation+Nesting.h"
-
+#import "NSDate+NiceFormats.h"
 
 NSString* const SSYOperationQueueDidEndWorkNotification = @"SSYOperationQueueDidEndWorkNotification" ;
 NSString* const SSYOperationQueueDidBeginWorkNotification = @"SSYOperationQueueDidBeginWorkNotification" ;
@@ -17,23 +17,19 @@
 NSString* const constKeySSYOperationQueueKeepWithNext = @"SSYOperationQueueKeepWithNext" ;
 NSString* const constKeySSYOperationGroup = @"SSYOperationGroup" ;
 
+@interface SSYOperationQueue ()
 
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  @implementation NSError (SSYOperationQueueExtras)
-
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  - (NSError*)errorByAddingOperationGroupFromInfo:(NSDictionary*)info {
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  	return [self errorByAddingUserInfoObject:[info objectForKey:constKeySSYOperationGroup]
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  									  forKey:constKeySSYOperationGroup] ;
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  }
-
-// No longer needed since override of -[SSYOperationQueue setError:] does this.  @end
+@property (retain) id noAppNapActivity ;
 
+@end
 
 
 @implementation SSYOperationQueue
 
 @synthesize scriptCommand = m_scriptCommand ;
 @synthesize scriptResult = m_scriptResult ;
 @synthesize skipOperationsExceptGroups = m_skipOperationsExceptGroups ;
+@synthesize noAppNapActivity = m_noAppNapActivity ;
 
 - (BOOL)shouldSkipOperationsInGroup:(NSString*)group {
 	NSSet* skipOperationsExceptGroups = [self skipOperationsExceptGroups] ;
@@ -132,6 +128,7 @@ - (void)dealloc {
 	[m_scriptResult release] ;
 	[m_errorRetryInvocations release] ;
 	[m_skipOperationsExceptGroups release] ;
+    [m_noAppNapActivity release] ;
 
 	[super dealloc] ;
 }
@@ -231,6 +228,15 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			else {
 				owner = self ;
 			}
+            
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
+            // Being built with Mac OS X 10.9 or later SDK
+            id activity = [self noAppNapActivity] ;
+            if (activity) {
+                [[NSProcessInfo processInfo] endActivity:activity];
+                /*SSYDBL*/ NSLog(@"Ended no-app-nap activity=%@", activity) ;
+            }
+#endif
 
 			// It is stated in the documentation of NSOperationQueue (in the
 			// introduction, not in -operations) that KVO notifications
@@ -252,6 +258,33 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
 			// when the count jumps from 0 to, say, 5.  Apparently,
 			// KVO notifications are coalesced.
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
+#warning "Built for 10.9"
+            // Being built with Mac OS X 10.9 or later SDK
+            if ([[NSProcessInfo processInfo] respondsToSelector:@selector(beginActivityWithOptions:reason:)]) {
+                // Running in Mac OS X 10.9 or later
+                NSString* groupName = nil ;
+                if ([[self operations] count] > 0) {
+                    SSYOperation* firstOperation = [[self operations] objectAtIndex:0] ;
+                    if ([firstOperation respondsToSelector:@selector(info)]) {
+                        NSDictionary* info = [firstOperation info] ;
+                        groupName = [info objectForKey:constKeySSYOperationGroup] ;
+                    }
+                }
+                if (!groupName) {
+                    groupName = @"?**?" ;
+                }
+                NSString* reason = [NSString stringWithFormat:
+                                    @"SSYOperations beginning with group %@ at %@",
+                                    groupName,
+                                    [[NSDate date] geekDateTimeString]] ;
+                id activity = [[NSProcessInfo processInfo] beginActivityWithOptions:NSActivityAutomaticTerminationDisabled
+                                                                             reason:reason] ;
+                /*SSYDBL*/ NSLog(@"Suspended app nap with activity=%@ for reason: %@", activity, reason) ;
+                [self setNoAppNapActivity:activity] ;
+            }
+#endif
+            
 			NSOperation <SSYOwnee> * operation = [[self operations] objectAtIndex:0] ;
 			id owner ;
 			if ([operation respondsToSelector:@selector(owner)]) {