BookMacster 1.19.6, shipped

Author: jerrykrinock

SSYOperationQueue.m

@@ -233,7 +233,13 @@ - (void)observeValueForKeyPath:(NSString*)keyPath
             // Being built with Mac OS X 10.9 or later SDK
             id activity = [self noAppNapActivity] ;
             if (activity) {
-                [[NSProcessInfo processInfo] endActivity:activity];
+                // The following test is actually defensive programming, because
+                // activity should only be YES if NSProcessInfo
+                // responds to -beginActivityWithOptions:reason:,
+                // which means that it should also respond to -endActivity:
+                if ([[NSProcessInfo processInfo] respondsToSelector:@selector(endActivity:)]) {
+                    [[NSProcessInfo processInfo] endActivity:activity] ;
+                }
             }
 #endif
 

SSYPopUpTableHeaderCell.h

@@ -13,42 +13,8 @@
  or http://lists.apple.com/archives/cocoa-dev/2005/Apr/msg01223.html
  but I've made enough improvements to it that I decided it deserves
  to have my own SSY prefix.
- 
- The instance variable realSelf is to work around in case a bug occurs:
- 
- I have a subclass of NSPopUpButtonCell which I use in place of an NSTableHeaderCell,
- providing a popup menu so that the user can choose what attribute is displayed in the column.
- This subclass retains an instance variable, which I call a templateHeaderCell.  This instance
- variable is a NSTableHeaderCell which it uses to draw the empty table header when needed.
- 
- Two of my table columns, in their -awakeFromNib, create one of these cells, and set them as
- their headerCell.  From NSLog in my subclass' -init, I see that these are the only two
- instances of my subclass which are ever created.
- 
- However, when clicking on the table column which causes redrawing, my subclass' -drawWithFrame:inView:
- is invoked by a third instance, one with a different 'self' value, of my subclass.  But it's
- worse -- the address of its -templateHeaderCell instance variable is the same as that in one of
- the two ^real^ instances.  So, it's like an identity theft.  The thief has the instance variables
- of the real object.
- 
- Apparently, whatever created the thief did not retain it, because it is soon deallocced, causing
- its instance variables to be deallocced, and things kind of go downhill from there when the ^real^
- instance comes back later and tries to access them :(
- 
- In order to work around this, during -init, I set another instance variable named 'realSelf':
-	[self setRealSelf:self] ;
- And then during -drawWithFrame:inView: and -dealloc, test before doing anything with:
-     if (self != [self realSelf])
- If this occurs I log an error and return.
- 
- This only happens if a column is resized without resizing other columns to compensate.  I have
- seen another column created in this case and suspect the other column is the one that created
- the thief.
-*/
-@interface SSYPopUpTableHeaderCell : NSPopUpButtonCell {	
-	// A bug catcher.  See long explanation in class documentation details
-	SSYPopUpTableHeaderCell* realSelf ;
-	
+*/ 
+@interface SSYPopUpTableHeaderCell : NSPopUpButtonCell {
 	CGFloat lostWidth ;
 }
 

SSYPopUpTableHeaderCell.m

@@ -2,75 +2,36 @@
 
 @interface SSYPopUpTableHeaderCell ()
 
-@property (retain) SSYPopUpTableHeaderCell* realSelf ;
 @property CGFloat lostWidth ;
+
 @end
 
 
 @implementation SSYPopUpTableHeaderCell
 
-@synthesize realSelf ;
 @synthesize lostWidth ;
 
+- (id)copyWithZone:(NSZone *)zone {
+    SSYPopUpTableHeaderCell* copy = [[SSYPopUpTableHeaderCell allocWithZone: zone] init] ;
+	[copy setLostWidth:[self lostWidth]] ;
+	
+    return copy ;
+}
+
 - (id)init {
-#if LOG_UNREAL_SSY_POP_UP_TABLE_HEADER_CELLS
-    BOOL didReinitialize = NO ;
-    if (realSelf) {
-        NSLog(@"Internal Error 340-8282 Re-initializing? oldSelf = %p realSelf = %p", self, realSelf) ;\
-        didReinitialize = YES ;
-    }
-#endif
 	if (self = [super init]) {
-		
-#if LOG_UNREAL_SSY_POP_UP_TABLE_HEADER_CELLS
-        if (didReinitialize) {
-            NSLog(@"Internal Error 340-8257 Re-initializing? newSelf = %p realSelf = %p", self, realSelf) ;\
-        }
-#endif
         // Set up the popup cell attributes
 		[self setControlSize:NSMiniControlSize] ;
 		[self setBordered:NO] ;
 		[self setBezeled:NO] ;
 		[self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]] ;
-
-		// Our mysterious bug catcher
-		[self setRealSelf:self] ;
 	}
 
 	return self ;
 }
 
-/*- (void)stopTracking:(NSPoint)lastPoint
-				  at:(NSPoint)stopPoint
-			  inView:(NSView *)controlView
-		   mouseIsUp:(BOOL)flag {
-NSLog(@"1068 %s", __PRETTY_FUNCTION__) ;
-}
-*/
-
-- (void)dealloc {
-	if (self != [self realSelf]) {
-#if LOG_UNREAL_SSY_POP_UP_TABLE_HEADER_CELLS
-		NSLog(@"Internal Error 340-9281 in %s", __PRETTY_FUNCTION__) ;
-#endif
-		return ;
-	}
-
-	[realSelf release] ;
-	[super dealloc] ;
-}
-
 - (void)drawWithFrame:(NSRect)cellFrame
 			   inView:(NSView*)controlView {
-	if (self != [self realSelf]) {
-#if LOG_UNREAL_SSY_POP_UP_TABLE_HEADER_CELLS
-		NSLog(@"Internal Error 300-9481 in %s", __PRETTY_FUNCTION__) ;
-		NSLog(@"      self: %p %@ %p %p %@", self, NSStringFromSize([self cellSize]), [self itemArray], [self controlView], [[self selectedItem] title]) ;
-		NSLog(@"  realSelf: %p %@ %p %p %@", realSelf, NSStringFromSize([realSelf cellSize]), [realSelf itemArray], [realSelf controlView], [[self selectedItem] title]) ;
-#endif
-		return ;
-	}
-	
 	// Apple's documentation for this -[NSCell drawWithFrame:inView: states
 	// "This method draws the cell in the currently focused view,
 	// which can be different from the controlView passed in. Taking advantage

SSYTableHeaderView.m

@@ -4,6 +4,25 @@
 @implementation SSYTableHeaderView : NSTableHeaderView
 
 - (void)drawRect:(NSRect)dirtyRect {
+    /*
+     Added in BookMacster 1.19.6.  After eliminating the realSelf crap from
+     SSYPopUpTableHeaderCell, when closing a document once, I got a failure in
+     this method, at end where it invokes [headerCell drawWithFrame:inView:],
+     an assertion was raised in -[NSView lockFocus].
+     
+     ** Assertion failure in -[SSYTableHeaderView lockFocus], /SourceCache/AppKit/AppKit-1265/AppKit.subproj/NSView.m:7041
+     2013-11-15 06:52:03.413 BookMacster[11590:303] -[SSYTableHeaderView(0x6080003ab6e0) lockFocus] failed with window=0x6000001f6700, windowNumber=-1, [self isHiddenOrHasHiddenAncestor]=0
+
+     Poking around with the
+     debugger, it seems that while the window controller is still around, its
+     -document is nil, and furthermore
+     [[NSDocumentController sharedDocumentController] documents] returns an
+     empty set.  So it seems like the following should fix this problem…
+     */
+    if ([[[self window] windowController] document] == nil) {
+        return ;
+    }
+    
 	CGFloat height = [self frame].size.height ;
 	CGFloat overallWidth = [self frame].size.width ;
 	CGFloat intercellWidth = [[self tableView] intercellSpacing].width ;