Before trying cleanLines.pl

Author: jerrykrinock

SSWebBrowsing.m

@@ -1,4 +1,5 @@
 #import "SSWebBrowsing.h"
+#import "NSBundle+MainApp.h"
 
 @implementation NSString (FirefoxQuicksearch)
 
@@ -17,7 +18,7 @@ - (NSString*)stringByFixingFirefoxQuicksearch {
 		// So, first we replace %s with our app name,
 		NSMutableString* temp = [self mutableCopy] ;
 		[temp replaceOccurrencesOfString:@"%s"
-							  withString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]
+							  withString:[[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleName"]
 								 options:NSBackwardsSearch
 								   range:NSMakeRange(0, [temp length])] ;
 		output =  [NSString stringWithString:temp] ;

SSYAlert.m

@@ -15,6 +15,7 @@
 #import "NSError+Recovery.h"
 #import "NSError+SSYInfo.h"
 #import "SSYWindowHangout.h"
+#import "NSBundle+MainApp.h"
 
 NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager = nil ;
 
@@ -363,7 +364,7 @@ @implementation SSYAlert : NSWindowController
 
 
 + (NSString*)supportEmailString {
-	return [[NSBundle mainBundle] objectForInfoDictionaryKey:SSYAlert_ErrorSupportEmailKey] ;
+	return [[NSBundle mainAppBundle] objectForInfoDictionaryKey:SSYAlert_ErrorSupportEmailKey] ;
 }
 
 - (id)clickObject {
@@ -651,18 +652,18 @@ + (NSInteger)tryRecoveryAttempterForError:(NSError*)error
 
 - (IBAction)help:(id)sender {
 	[[NSHelpManager sharedHelpManager] openHelpAnchor:[self helpAnchorString]
-											   inBook:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleHelpBookName"]] ;
+											   inBook:[[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleHelpBookName"]] ;
 }
 
 - (IBAction)support:(id)sender {
 	[SSYAlert supportError:[self errorPresenting]] ;
 }
 
 + (void)supportError:(NSError*)error {
-	NSString* appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"] ;
+	NSString* appName = [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"] ;
 	// Note: If you'd prefer the app name to be localized, use "CFBundleName" instead.
-	NSString* appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"] ;
-	NSString* appVersionString = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] ;
+	NSString* appVersion = [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleVersion"] ;
+	NSString* appVersionString = [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] ;
 	NSString* systemDescription = [SSYSystemDescriber softwareVersionAndArchitecture] ;
 	NSString* mailableDescription ;
 	if (
@@ -678,7 +679,7 @@ + (void)supportError:(NSError*)error {
 
 			NSString* filename = [NSString stringWithFormat:
 								  @"%@-Error-%lx.txt",
-								  [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"],
+								  [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleName"],
 								  (long)[NSDate timeIntervalSinceReferenceDate]] ;
 			NSString* filePath = [[NSHomeDirectory() stringByAppendingPathComponent:@"Desktop"] stringByAppendingPathComponent:filename] ;
 			NSError* writeError = nil ;
@@ -836,7 +837,7 @@ - (void)setSupportEmail {
 			[button setBezelStyle:NSRegularSquareBezelStyle] ;
 			[button setTarget:self] ;
 			[button setAction:@selector(support:)] ;
-			NSString* imagePath = [[NSBundle mainBundle] pathForResource:@"support"
+			NSString* imagePath = [[NSBundle mainAppBundle] pathForResource:@"support"
 																  ofType:@"tif"] ;
 			NSImage* image = [[NSImage alloc] initByReferencingFile:imagePath] ;
 			[button setImage:image] ;
@@ -858,7 +859,7 @@ - (void)setSupportEmail {
 
 - (void)setWindowTitle:(NSString*)title {
 	if (!title) {
-		title = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ; // CFBundleName may be localized
+		title = [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleName"] ; // CFBundleName may be localized
 	}
 
 	[[self window] setTitle:title] ;
@@ -1912,7 +1913,7 @@ - (id)init {
 														 styleMask:NSTitledWindowMask
 														   backing:NSBackingStoreBuffered
 															 defer:NO] ;
-	NSString* appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] ; // CFBundleName may be localized
+	NSString* appName = [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleName"] ; // CFBundleName may be localized
 	if (appName) {
 		[window setTitle:appName] ;
 	}

SSYAlertSounder.m

@@ -1,5 +1,6 @@
 #import "SSYAlertSounder.h"
 #import <AudioToolbox/AudioServices.h>
+#import "NSBundle+MainApp.h"
 
 
 static SSYAlertSounder* static_sharedSounder = nil ;
@@ -79,7 +80,7 @@ - (void)playAlertSoundNamed:(NSString*)name {
 
 	// If not found, look in the current application's bundle
 	if (!soundId) {
-		path = [[NSBundle mainBundle] pathForResource:name
+		path = [[NSBundle mainAppBundle] pathForResource:name
 											   ofType:@"aiff"] ;
 
 		soundId = [self soundIdForPath:path

SSYAppInfo.m

@@ -1,4 +1,5 @@
 #import "SSYAppInfo.h"
+#import "NSBundle+MainApp.h"
 
 NSString * const constKeyLastVersion = @"lastVersion" ;
 
@@ -72,7 +73,7 @@ + (SSYVersionTriplet*)rawPreviousVersionTriplet {
 }
 
 + (SSYVersionTriplet*)rawCurrentVersionTriplet {
-	NSString* versionString = [SSYVersionTriplet rawVersionStringFromBundle:[NSBundle mainBundle]] ;
+	NSString* versionString = [SSYVersionTriplet rawVersionStringFromBundle:[NSBundle mainAppBundle]] ;
 	SSYVersionTriplet* cvt = [SSYVersionTriplet versionTripletFromString:versionString] ;
 	return cvt ;
 }
@@ -86,7 +87,7 @@ - (void)calculateUpgradeState {
     [self setUpgradeState:upgradeState] ;
     if ([self upgradeState] != SSYCurrentRev) {
         // Get a nice, clean, filtered versionString of the form "major.minor.bugFix" using SSVersionTriplet methods
-        SSYVersionTriplet* currentVersionTriplet = [SSYVersionTriplet versionTripletFromBundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]] ;
+        SSYVersionTriplet* currentVersionTriplet = [SSYVersionTriplet versionTripletFromBundleIdentifier:[[NSBundle mainAppBundle] bundleIdentifier]] ;
         NSString* currentVersionString = [currentVersionTriplet string] ;
 
         // Record currently-launched version into prefs

SSYDooDooUndoManager.m

@@ -38,7 +38,7 @@ - (id)initWithDocument:(NSPersistentDocument*)document {
 		// We cast to an id since the compiler expects these to methods
 		// to get something which inherits from NSUndoManager, which 
 		// GCUndoManager does not.
-		[document setUndoManager:(id)self] ;
+		[document setUndoManager:(id)self] ; // Causes moc to be created, which causes persisten store to be created ??
 		[[document managedObjectContext] setUndoManager:(id)self] ;
 
 		[self setManagedObjectContext:[document managedObjectContext]] ;

SSYMOCManager.m

@@ -11,6 +11,7 @@
 #import "NSObject+MoreDescriptions.h"
 #import "BkmxBasis.h"
 #import "NSBundle+SSYMotherApp.h"
+#import "NSBundle+MainApp.h"
 
 
 NSString* const constKeyMOC = @"moc" ;
@@ -85,7 +86,7 @@ - (void)attemptRecoveryFromError:(NSError*)error
 			NSString* extension = [oldFilename pathExtension] ;
 			NSString* newFilename = [NSString stringWithFormat:
 									 @"%@-Unreadable-%@",
-									 [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"],
+									 [[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"],
 									 oldBaseFilename] ;
 			// We used CFBundleExecutable instead of CFBundleName to get an unlocalized app name.
 			newFilename = [newFilename stringByAppendingPathExtension:extension] ;
@@ -118,14 +119,16 @@ + (NSURL*)sqliteStoreURLWithIdentifier:(NSString*)identifier {
 		identifier = @"Shared" ;
 	}
 	filename = [identifier stringByAppendingPathExtension:SSYManagedObjectContextPathExtensionForSqliteStores] ;
-	NSString* path = [[[NSBundle mainBundle] applicationSupportPathForMotherApp] stringByAppendingPathComponent:filename] ;
+    NSBundle* mainAppBundle = [NSBundle mainAppBundle] ;
+	NSString* path = [[mainAppBundle applicationSupportPathForMotherApp] stringByAppendingPathComponent:filename] ;
     NSURL* url = nil ;
     if (path) {
         // Above if() was added in BookMacster 1.19 to eliminate crash in case
         // the app's Application Suppport folder is trashed while Worker is
         // watching one or more files in it for changes.
         url = [NSURL fileURLWithPath:path] ;
     }
+
 	return url ;
 }
 
@@ -140,7 +143,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 														error_p:(NSError**)error_p {
 	NSPersistentStore* persistentStore = nil ;
 
-	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainBundle]] ;
+	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainAppBundle]] ;
 	NSManagedObjectModel* mergedMOM = [NSManagedObjectModel mergedModelFromBundles:bundles] ;
 	NSPersistentStoreCoordinator* newPSC = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:mergedMOM] ;
 
@@ -155,7 +158,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 		// is that if the parent folder does not exist, the method will fail to create a
 		// persistent store with no explanation.  So we make sure it exists
 		NSString* parentPath = [[url path] stringByDeletingLastPathComponent] ;
-        
+
         if (!parentPath) {
             ok = NO ;
         }
@@ -192,7 +195,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
             }
 		}
 
-		if (ok) {	
+		if (ok) {
 			NSDictionary* options ;
 		   if (momdName) {
 			   // Using Multi-Hop Migration
@@ -230,7 +233,7 @@ + (NSPersistentStoreCoordinator*)persistentStoreCoordinatorType:(NSString*)store
 					   // If we did not get a store but file exists, must be a corrupt file.
 					   NSString* msg = [NSString stringWithFormat:@"Click 'Move' to move the unreadable database\n%@\nto your desktop and start a new database.  The item properties in your old database will not be available to %@.",
 										[url path],
-										[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"]] ;
+										[[NSBundle mainAppBundle] objectForInfoDictionaryKey:@"CFBundleExecutable"]] ;
 					   // We used CFBundleExecutable instead of CFBundleName to get an unlocalized app name.
 					   if (error_p) {
 						   *error_p = [*error_p errorByAddingLocalizedRecoverySuggestion:msg] ;

SSYManagedObject.m

@@ -5,6 +5,7 @@
 #import "NSSet+Identicalness.h"
 #import "NSDocument+SyncModDate.h"
 #import "NSObject+MoreDescriptions.h"
+#import "NSBundle+MainApp.h"
 
 // Public Notifications
 NSString* const constNoteWillUpdateObject = @"willUpdateObject" ;
@@ -124,7 +125,7 @@ + (NSString*)entityNameForClass:(Class)class {
 }
 
 + (NSEntityDescription*)entityDescription {
-	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainBundle]] ;
+	NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainAppBundle]] ;
 	NSManagedObjectModel* mom = [NSManagedObjectModel mergedModelFromBundles:bundles] ;
 	NSPersistentStoreCoordinator* psc = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:mom] ;
 	NSManagedObjectContext* moc = [[NSManagedObjectContext alloc] init] ;

SSYMojo.m

@@ -154,17 +154,33 @@ - (NSArray*)allObjectsError_p:(NSError**)error_p {
 	// when it invoked -[NSArrayController removeSelectionIndexes:[self selectionIndexes]] ;
 	// [managedObjectContext processPendingChanges] ;  // Do not do this
 
-	[fetchRequest setEntity:[NSEntityDescription entityForName:[self entityName]  
-										inManagedObjectContext:managedObjectContext]];
-	// Since we didn't set a predicate in fetchRequest, we get all objects
-	NSArray* allObjects = [managedObjectContext executeFetchRequest:fetchRequest
-															  error:&error] ;
-	if (error) {
-		NSLog(@"Internal Error 915-1874 %@", [error localizedDescription]) ;
-		if (error_p) {
-			*error_p = error ;
-		}
-	}		
+	NSEntityDescription* entity = [NSEntityDescription entityForName:[self entityName]
+                                              inManagedObjectContext:managedObjectContext] ;
+    NSArray* allObjects ;
+    if (entity) {
+        [fetchRequest setEntity:entity] ;
+        // Since we didn't set a predicate in fetchRequest, we get all objects
+        allObjects = [managedObjectContext executeFetchRequest:fetchRequest
+                                                         error:&error] ;
+        if (error) {
+            NSLog(@"Internal Error 915-1874 %@", [error localizedDescription]) ;
+            if (error_p) {
+                *error_p = error ;
+            }
+        }
+    }
+    else {
+        // Defensive programming added in BookMacster 1.19.2.  If data model
+        // is not available, entity will be nil and if we didn't test for that,
+        // -[NSManagedObjectContext executeFetchRequest:error] would crash
+        // due to nil entity in fetch request.
+        NSString* errorDesc = [NSString stringWithFormat:@"No entity for %@", [self entityName]] ;
+        NSLog(@"Internal Error 915-0893 %@", errorDesc) ;
+        if (error_p) {
+            *error_p = SSYMakeError(262049, errorDesc) ;
+        }
+        allObjects = nil ;
+    }
 	[fetchRequest release] ;
 
 	return allObjects ;

SSYOAuthTalker.m

@@ -9,6 +9,7 @@
 #import "NSString+URIQuery.h"
 #import "NSString+LocalizeSSY.h"
 #import "NSObject+MoreDescriptions.h"
+#import "NSBundle+MainApp.h"
 
 NSString* const constNoteGotOAuthInfo = @"gotOAuthInfo" ;
 NSString* const constPathOAuth = @"OAuth" ;
@@ -52,7 +53,7 @@ @implementation SSYOAuthTalker
 @synthesize accounter = m_accounter ;
 
 + (NSString*)keychainServiceNameForAccounter:(NSObject <SSYOAuthAccounter> *)accounter {
-	NSString* answer = [[NSBundle mainBundle] bundleIdentifier] ;
+	NSString* answer = [[NSBundle mainAppBundle] bundleIdentifier] ;
 	if ([accounter respondsToSelector:@selector(serviceName)]) {
 		answer = [answer stringByAppendingFormat:
 				  @".%@",

SSYPersistentDocumentMultiMigrator.m

@@ -5,6 +5,7 @@
 #import "NSString+MorePaths.h"
 #import "NSDocument+SyncModDate.h"
 #import "NSError+Recovery.h"
+#import "NSBundle+MainApp.h"
 
 NSString* const SSYPersistentDocumentMultiMigratorErrorDomain = @"SSYPersistentDocumentMultiMigratorErrorDomain" ;
 NSString* const SSYPersistentDocumentMultiMigratorDidBeginMigrationNotification = @"SSYPersistentDocumentMultiMigratorDidBeginMigrationNotification" ;
@@ -71,7 +72,7 @@ + (BOOL)migrateIfNeededStoreAtUrl:(NSURL*)url
 	}
 
 	// Read the "VersionInfo" plist.
-	NSString* momdPath = [[NSBundle mainBundle] pathForResource:momdName
+	NSString* momdPath = [[NSBundle mainAppBundle] pathForResource:momdName
 														 ofType:@"momd"] ;
 	NSBundle* modelBundle = [NSBundle bundleWithPath:momdPath] ;
 	if (!modelBundle) {
@@ -201,7 +202,7 @@ + (BOOL)migrateIfNeededStoreAtUrl:(NSURL*)url
 		// successful destination the destinModel.
 		NSManagedObjectModel* destinModel = nil ;
 		NSMappingModel* mappingModel = nil ;
-		NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainBundle]] ;
+		NSArray* bundles = [NSArray arrayWithObject:[NSBundle mainAppBundle]] ;
 		NSString* destinModelVersionName = nil ;
 		for (destinModelVersionName in modelVersionNames) {
 			NSString* modelPath = [modelBundle pathForResource:destinModelVersionName

SSYSemaphore.m

@@ -3,6 +3,7 @@
 #import "SSYOtherApper.h"
 #import "BkmxBasis.h"
 #import "NSBundle+SSYMotherApp.h"
+#import "NSBundle+MainApp.h"
 
 @implementation SSYSemaphorePidKey
 
@@ -99,7 +100,7 @@ + (SSYSemaphorePidKey*)pidKeyWithString:(NSString*)pidKeyString {
 @implementation SSYSemaphore
 
 + (NSString*)path {
-	return [[[NSBundle mainBundle] applicationSupportPathForMotherApp] stringByAppendingPathComponent:@".SSYSemaphore"] ;
+	return [[[NSBundle mainAppBundle] applicationSupportPathForMotherApp] stringByAppendingPathComponent:@".SSYSemaphore"] ;
 }
 
 + (SSYSemaphorePidKey*)currentPidKeyEnforcingTimeLimit:(NSTimeInterval)timeLimit  {