ARC

Author: mxcl

ApplicationController.m

@@ -16,27 +16,24 @@
 #import "PBNSURLPathUserDefaultsTransfomer.h"
 #import "PBGitDefaults.h"
 
+
+
 @implementation ApplicationController
 
-- (ApplicationController*)init
-{
+- (ApplicationController *)init {
 #ifdef DEBUG_BUILD
 	[NSApp activateIgnoringOtherApps:YES];
 #endif
 
-	if(!(self = [super init]))
-		return nil;
-
-	if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
-		if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
-			NSLog(@"Could not load QuickLook");
+	if (self = [super init]) {
+        if (![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
+            if (![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
+                NSLog(@"Could not load QuickLook");
 
-	/* Value Transformers */
-	NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
-	[NSValueTransformer setValueTransformer:transformer forName:@"PBNSURLPathUserDefaultsTransfomer"];
-	
-	// Make sure the PBGitDefaults is initialized, by calling a random method
-	[PBGitDefaults class];
+        [NSValueTransformer setValueTransformer:[PBNSURLPathUserDefaultsTransfomer new] forName:@"PBNSURLPathUserDefaultsTransfomer"];
+        
+        [PBGitDefaults class]; // Make sure the PBGitDefaults is initialized, by calling a random method
+    }
 	return self;
 }
 
@@ -101,9 +98,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 		[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
 }
 
-- (void) windowWillClose: sender
+- (void)windowWillClose:sender
 {
-	[firstResponder terminate: sender];
+	[firstResponder terminate:sender];
 }
 
 - (IBAction)openPreferencesWindow:(id)sender
@@ -167,125 +164,60 @@ - (IBAction)installCliTool:(id)sender;
 	}
 }
 
-/**
-    Returns the support folder for the application, used to store the Core Data
-    store file.  This code uses a folder named "GitTest" for
-    the content, either in the NSApplicationSupportDirectory location or (if the
-    former cannot be found), the system's temporary directory.
- */
-
 - (NSString *)applicationSupportFolder {
 
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
     NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory();
     return [basePath stringByAppendingPathComponent:@"GitTest"];
 }
 
-
-/**
-    Creates, retains, and returns the managed object model for the application 
-    by merging all of the models found in the application bundle.
- */
- 
 - (NSManagedObjectModel *)managedObjectModel {
-
-    if (managedObjectModel != nil) {
-        return managedObjectModel;
-    }
-	
-    managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
-    return managedObjectModel;
+    return managedObjectModel ?: (managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil]);
 }
 
-
-/**
-    Returns the persistent store coordinator for the application.  This 
-    implementation will create and return a coordinator, having added the 
-    store for the application to it.  (The folder for the store is created, 
-    if necessary.)
- */
-
 - (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
-
-    if (persistentStoreCoordinator != nil) {
-        return persistentStoreCoordinator;
-    }
-
-    NSFileManager *fileManager;
-    NSString *applicationSupportFolder = nil;
-    NSURL *url;
-    NSError *error;
-    
-    fileManager = [NSFileManager defaultManager];
-    applicationSupportFolder = [self applicationSupportFolder];
-    if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
-        [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
+    if (!persistentStoreCoordinator) {
+        NSFileManager *fileManager;
+        NSString *applicationSupportFolder = nil;
+        NSURL *url;
+        NSError *error;
+        
+        fileManager = [NSFileManager defaultManager];
+        applicationSupportFolder = [self applicationSupportFolder];
+        if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
+            [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
+        }
+        
+        url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];
+        persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: [self managedObjectModel]];
+        if (![persistentStoreCoordinator addPersistentStoreWithType:NSXMLStoreType configuration:nil URL:url options:nil error:&error]){
+            [[NSApplication sharedApplication] presentError:error];
+        }
     }
-    
-    url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];
-    persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: [self managedObjectModel]];
-    if (![persistentStoreCoordinator addPersistentStoreWithType:NSXMLStoreType configuration:nil URL:url options:nil error:&error]){
-        [[NSApplication sharedApplication] presentError:error];
-    }    
 
     return persistentStoreCoordinator;
 }
 
-
-/**
-    Returns the managed object context for the application (which is already
-    bound to the persistent store coordinator for the application.) 
- */
- 
 - (NSManagedObjectContext *) managedObjectContext {
-
-    if (managedObjectContext != nil) {
-        return managedObjectContext;
-    }
-
-    NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
-    if (coordinator != nil) {
-        managedObjectContext = [[NSManagedObjectContext alloc] init];
-        [managedObjectContext setPersistentStoreCoordinator: coordinator];
+    if (!managedObjectContext) {
+        managedObjectContext = [NSManagedObjectContext new];
+        managedObjectContext.persistentStoreCoordinator = self.persistentStoreCoordinator;
     }
-    
     return managedObjectContext;
 }
 
-
-/**
-    Returns the NSUndoManager for the application.  In this case, the manager
-    returned is that of the managed object context for the application.
- */
- 
 - (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)window {
-    return [[self managedObjectContext] undoManager];
+    return self.managedObjectContext.undoManager;
 }
-
-
-/**
-    Performs the save action for the application, which is to send the save:
-    message to the application's managed object context.  Any encountered errors
-    are presented to the user.
- */
 
 - (IBAction) saveAction:(id)sender {
-
-    NSError *error = nil;
+    id error = nil;
     if (![[self managedObjectContext] save:&error]) {
-        [[NSApplication sharedApplication] presentError:error];
+        [NSApp presentError:error];
     }
 }
 
-
-/**
-    Implementation of the applicationShouldTerminate: method, used here to
-    handle the saving of changes in the application managed object context
-    before the application terminates.
- */
- 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
-
     NSError *error;
     int reply = NSTerminateNow;
 
@@ -348,10 +280,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 
 - (void) dealloc {
 
-    [managedObjectContext release], managedObjectContext = nil;
-    [persistentStoreCoordinator release], persistentStoreCoordinator = nil;
-    [managedObjectModel release], managedObjectModel = nil;
-    [super dealloc];
+    managedObjectContext = nil;
+    persistentStoreCoordinator = nil;
+    managedObjectModel = nil;
 }
 
 #pragma mark Help menu

DBPrefsWindowController.m

@@ -74,14 +74,14 @@ - (void)windowDidLoad
 		// Create a new window to display the preference views.
 		// If the developer attached a window to this controller
 		// in Interface Builder, it gets replaced with this one.
-	NSPanel *panel = [[[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
+	NSPanel *panel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
 												    styleMask:(NSTitledWindowMask |
 															   NSClosableWindowMask |
 															   NSMiniaturizableWindowMask)
 													  backing:NSBackingStoreBuffered
-													    defer:YES] autorelease];
+													    defer:YES];
 	[self setWindow:panel];
-	contentSubview = [[[NSView alloc] initWithFrame:[[[self window] contentView] frame]] autorelease];
+	contentSubview = [[NSView alloc] initWithFrame:[[[self window] contentView] frame]];
 	[contentSubview setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 	[[[self window] contentView] addSubview:contentSubview];
 	[[self window] setShowsToolbarButton:NO];
@@ -90,13 +90,6 @@ - (void)windowDidLoad
 
 
 
-- (void) dealloc {
-	[toolbarIdentifiers release];
-	[toolbarViews release];
-	[toolbarItems release];
-	[viewAnimation release];
-	[super dealloc];
-}
 
 
 
@@ -129,12 +122,12 @@ - (void)addView:(NSView *)view label:(NSString *)label image:(NSImage *)image
 	NSAssert (view != nil,
 			  @"Attempted to add a nil view when calling -addView:label:image:.");
 
-	NSString *identifier = [[label copy] autorelease];
+	NSString *identifier = [label copy];
 
 	[toolbarIdentifiers addObject:identifier];
 	[toolbarViews setObject:view forKey:identifier];
 
-	NSToolbarItem *item = [[[NSToolbarItem alloc] initWithItemIdentifier:identifier] autorelease];
+	NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:identifier];
 	[item setLabel:label];
 	[item setImage:image];
 	[item setTarget:self];
@@ -208,7 +201,6 @@ - (IBAction)showWindow:(id)sender
 		[toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
 		[toolbar setDelegate:self];
 		[[self window] setToolbar:toolbar];
-		[toolbar release];
 	}
 
 	NSString *identifier = [self defaultViewIdentifier];

English.lproj/MainMenu.xib

@@ -2,19 +2,19 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11D50b</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12A269</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2182</string>
+			<string key="NS.object.0">2549</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSUserDefaultsController</string>
+			<string>NSCustomObject</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
+			<string>NSUserDefaultsController</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -938,9 +938,6 @@
 			<object class="NSUserDefaultsController" id="391227374">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
-			<object class="NSCustomObject" id="203602687">
-				<string key="NSClassName">SUUpdater</string>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -1376,14 +1373,6 @@
 					</object>
 					<int key="connectionID">973</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">checkForUpdates:</string>
-						<reference key="source" ref="203602687"/>
-						<reference key="destination" ref="679871620"/>
-					</object>
-					<int key="connectionID">920</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1977,11 +1966,6 @@
 						<reference key="object" ref="552718495"/>
 						<reference key="parent" ref="245837913"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">918</int>
-						<reference key="object" ref="203602687"/>
-						<reference key="parent" ref="0"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">919</int>
 						<reference key="object" ref="679871620"/>
@@ -2169,7 +2153,6 @@
 				<string key="912.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="915.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="916.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="918.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="919.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="927.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="928.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2235,10 +2218,6 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1070" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1070" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<real value="4300" key="NS.object.0"/>

English.lproj/PBRemoteProgressSheet.xib

@@ -53,7 +53,6 @@
 							<int key="NSvFlags">1314</int>
 							<string key="NSFrame">{{18, 16}, {361, 20}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSNextKeyView"/>
 							<int key="NSpiFlags">16394</int>
 							<double key="NSMaxValue">100</double>
 						</object>