Issue #13 - cleaning up ivar storage

Remove @synthesize & use self.

Author: rowanj

Classes/Controllers/PBGitCommitController.m

@@ -13,6 +13,7 @@
 #import "PBGitIndex.h"
 #import "PBNiceSplitView.h"
 #import "PBGitRepositoryWatcher.h"
+#import "PBGitWindowController.h"
 
 #import <ObjectiveGit/GTRepository.h>
 #import <ObjectiveGit/GTConfiguration.h>
@@ -75,7 +76,7 @@ - (void)awakeFromNib
 		[[NSSortDescriptor alloc] initWithKey:@"path" ascending:true]]];
 
   // listen for updates
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:repository];
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:self.repository];
 
 	[cachedFilesController setAutomaticallyRearrangesObjects:NO];
 	[unstagedFilesController setAutomaticallyRearrangesObjects:NO];
@@ -106,10 +107,10 @@ - (NSResponder *)firstResponder;
 
 - (IBAction)signOff:(id)sender
 {
-	NSString* userName = [repository.gtRepo.configuration stringForKey:@"user.name"];
-	NSString* userEmail = [repository.gtRepo.configuration stringForKey:@"user.email"];
+	NSString* userName = [self.repository.gtRepo.configuration stringForKey:@"user.name"];
+	NSString* userEmail = [self.repository.gtRepo.configuration stringForKey:@"user.email"];
 	if (!(userName && userEmail))
-		return [[repository windowController] showMessageSheet:@"User's name not set" infoText:@"Signing off a commit requires setting user.name and user.email in your git config"];
+		return [[self.repository windowController] showMessageSheet:@"User's name not set" infoText:@"Signing off a commit requires setting user.name and user.email in your git config"];
 	NSString *SOBline = [NSString stringWithFormat:@"Signed-off-by: %@ <%@>",
 				userName,
 				userEmail];
@@ -129,7 +130,7 @@ - (void) refresh:(id) sender
 	[self.index refresh];
 
 	// Reload refs (in case HEAD changed)
-	[repository reloadRefs];
+	[self.repository reloadRefs];
 }
 
 - (void) updateView
@@ -149,19 +150,19 @@ - (IBAction) forceCommit:(id) sender
 
 - (void) commitWithVerification:(BOOL) doVerify
 {
-	if ([[NSFileManager defaultManager] fileExistsAtPath:[repository.gitURL.path stringByAppendingPathComponent:@"MERGE_HEAD"]]) {
-		[[repository windowController] showMessageSheet:@"Cannot commit merges" infoText:@"GitX cannot commit merges yet. Please commit your changes from the command line."];
+	if ([[NSFileManager defaultManager] fileExistsAtPath:[self.repository.gitURL.path stringByAppendingPathComponent:@"MERGE_HEAD"]]) {
+		[[self.repository windowController] showMessageSheet:@"Cannot commit merges" infoText:@"GitX cannot commit merges yet. Please commit your changes from the command line."];
 		return;
 	}
 
 	if ([[cachedFilesController arrangedObjects] count] == 0) {
-		[[repository windowController] showMessageSheet:@"No changes to commit" infoText:@"You must first stage some changes before committing"];
+		[[self.repository windowController] showMessageSheet:@"No changes to commit" infoText:@"You must first stage some changes before committing"];
 		return;
 	}		
 
 	NSString *commitMessage = [commitMessageView string];
 	if ([commitMessage length] < 3) {
-		[[repository windowController] showMessageSheet:@"Commitmessage missing" infoText:@"Please enter a commit message before committing"];
+		[[self.repository windowController] showMessageSheet:@"Commitmessage missing" infoText:@"Please enter a commit message before committing"];
 		return;
 	}
 
@@ -200,7 +201,7 @@ - (void)commitFailed:(NSNotification *)notification
 	NSString *reason = [[notification userInfo] objectForKey:@"description"];
 	self.status = [@"Commit failed: " stringByAppendingString:reason];
 	[commitMessageView setEditable:YES];
-	[[repository windowController] showMessageSheet:@"Commit failed" infoText:reason];
+	[[self.repository windowController] showMessageSheet:@"Commit failed" infoText:reason];
 }
 
 - (void)commitHookFailed:(NSNotification *)notification
@@ -209,7 +210,7 @@ - (void)commitHookFailed:(NSNotification *)notification
 	NSString *reason = [[notification userInfo] objectForKey:@"description"];
 	self.status = [@"Commit hook failed: " stringByAppendingString:reason];
 	[commitMessageView setEditable:YES];
-	[[repository windowController] showCommitHookFailedSheet:@"Commit hook failed" infoText:reason commitController:self];
+	[[self.repository windowController] showCommitHookFailedSheet:@"Commit hook failed" infoText:reason commitController:self];
 }
 
 - (void)amendCommit:(NSNotification *)notification
@@ -237,7 +238,7 @@ - (void)indexChanged:(NSNotification *)notification
 
 - (void)indexOperationFailed:(NSNotification *)notification
 {
-	[[repository windowController] showMessageSheet:@"Index operation failed" infoText:[[notification userInfo] objectForKey:@"description"]];
+	[[self.repository windowController] showMessageSheet:@"Index operation failed" infoText:[[notification userInfo] objectForKey:@"description"]];
 }
 
 

Classes/Controllers/PBGitHistoryController.m

@@ -25,6 +25,7 @@
 #define QLPreviewPanel NSClassFromString(@"QLPreviewPanel")
 #import "PBQLTextView.h"
 #import "GLFileView.h"
+#import "PBGitWindowController.h"
 
 
 #define kHistorySelectedDetailIndexKey @"PBHistorySelectedDetailIndex"
@@ -53,10 +54,10 @@ - (void)awakeFromNib
 	[self.commitController addObserver:self forKeyPath:@"arrangedObjects.@count" options:NSKeyValueObservingOptionInitial context:@"updateCommitCount"];
 	[self.treeController addObserver:self forKeyPath:@"selection" options:0 context:@"treeChange"];
 
-	[repository.revisionList addObserver:self forKeyPath:@"isUpdating" options:0 context:@"revisionListUpdating"];
-	[repository addObserver:self forKeyPath:@"currentBranch" options:0 context:@"branchChange"];
-	[repository addObserver:self forKeyPath:@"refs" options:0 context:@"updateRefs"];
-	[repository addObserver:self forKeyPath:@"currentBranchFilter" options:0 context:@"branchFilterChange"];
+	[self.repository.revisionList addObserver:self forKeyPath:@"isUpdating" options:0 context:@"revisionListUpdating"];
+	[self.repository addObserver:self forKeyPath:@"currentBranch" options:0 context:@"branchChange"];
+	[self.repository addObserver:self forKeyPath:@"refs" options:0 context:@"updateRefs"];
+	[self.repository addObserver:self forKeyPath:@"currentBranchFilter" options:0 context:@"branchFilterChange"];
 
 	forceSelectionUpdate = YES;
 	NSSize cellSpacing = [self.commitList intercellSpacing];
@@ -65,14 +66,14 @@ - (void)awakeFromNib
 	[fileBrowser setTarget:self];
 	[fileBrowser setDoubleAction:@selector(openSelectedFile:)];
 
-	if (!repository.currentBranch) {
-		[repository reloadRefs];
-		[repository readCurrentBranch];
+	if (!self.repository.currentBranch) {
+		[self.repository reloadRefs];
+		[self.repository readCurrentBranch];
+	} else {
+		[self.repository lazyReload];
 	}
-	else
-		[repository lazyReload];
 
-    if (![repository hasSVNRemote])
+    if (![self.repository hasSVNRemote])
     {
         // Remove the SVN revision table column for repositories with no SVN remote configured
         [self.commitList removeTableColumn:[self.commitList tableColumnWithIdentifier:@"GitSVNRevision"]];
@@ -94,7 +95,7 @@ - (void)awakeFromNib
 	[self updateBranchFilterMatrix];
 
   // listen for updates
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:repository];
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:self.repository];
 
 	[super awakeFromNib];
 }
@@ -139,11 +140,11 @@ - (void)updateKeys
 
 - (void) updateBranchFilterMatrix
 {
-	if ([repository.currentBranch isSimpleRef]) {
+	if ([self.repository.currentBranch isSimpleRef]) {
 		[allBranchesFilterItem setEnabled:YES];
 		[localRemoteBranchesFilterItem setEnabled:YES];
 
-		NSInteger filter = repository.currentBranchFilter;
+		NSInteger filter = self.repository.currentBranchFilter;
 		[allBranchesFilterItem setState:(filter == kGitXAllBranchesFilter)];
 		[localRemoteBranchesFilterItem setState:(filter == kGitXLocalRemoteBranchesFilter)];
 		[selectedBranchFilterItem setState:(filter == kGitXSelectedBranchFilter)];
@@ -158,10 +159,10 @@ - (void) updateBranchFilterMatrix
 		[selectedBranchFilterItem setState:YES];
 	}
 
-	[selectedBranchFilterItem setTitle:[repository.currentBranch title]];
+	[selectedBranchFilterItem setTitle:[self.repository.currentBranch title]];
 	[selectedBranchFilterItem sizeToFit];
 
-	[localRemoteBranchesFilterItem setTitle:[[repository.currentBranch ref] isRemote] ? @"Remote" : @"Local"];
+	[localRemoteBranchesFilterItem setTitle:[[self.repository.currentBranch ref] isRemote] ? @"Remote" : @"Local"];
 }
 
 - (PBGitCommit *) firstCommit
@@ -196,7 +197,7 @@ - (int) selectedCommitDetailsIndex
 
 - (void) updateStatus
 {
-	self.isBusy = repository.revisionList.isUpdating;
+	self.isBusy = self.repository.revisionList.isUpdating;
 	self.status = [NSString stringWithFormat:@"%lu commits loaded", [[self.commitController arrangedObjects] count]];
 }
 
@@ -272,16 +273,16 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 	}
 
 	if ([strContext isEqualToString:@"branchFilterChange"]) {
-		[PBGitDefaults setBranchFilter:repository.currentBranchFilter];
+		[PBGitDefaults setBranchFilter:self.repository.currentBranchFilter];
 		[self updateBranchFilterMatrix];
 		return;
 	}
 
 	if([strContext isEqualToString:@"updateCommitCount"] || [(__bridge NSString *)context isEqualToString:@"revisionListUpdating"]) {
 		[self updateStatus];
 
-		if ([repository.currentBranch isSimpleRef])
-			[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
+		if ([self.repository.currentBranch isSimpleRef])
+			[self selectCommit:[self.repository shaForRef:[self.repository.currentBranch ref]]];
 		else
 			[self selectCommit:[[self firstCommit] sha]];
 		return;
@@ -324,16 +325,16 @@ - (IBAction) setTreeView:(id)sender
 
 - (IBAction) setBranchFilter:(id)sender
 {
-	repository.currentBranchFilter = [(NSView*)sender tag];
-	[PBGitDefaults setBranchFilter:repository.currentBranchFilter];
+	self.repository.currentBranchFilter = [(NSView*)sender tag];
+	[PBGitDefaults setBranchFilter:self.repository.currentBranchFilter];
 	[self updateBranchFilterMatrix];
 	forceSelectionUpdate = YES;
 }
 
 - (void)keyDown:(NSEvent*)event
 {
 	if ([[event charactersIgnoringModifiers] isEqualToString: @"f"] && [event modifierFlags] & NSAlternateKeyMask && [event modifierFlags] & NSCommandKeyMask)
-		[superController.window makeFirstResponder: searchField];
+		[self.superController.window makeFirstResponder: searchField];
 	else
 		[super keyDown: event];
 }
@@ -435,7 +436,7 @@ - (void) updateQuicklookForce:(BOOL)force
 
 - (IBAction) refresh:(id)sender
 {
-	[repository forceUpdateRevisions];
+	[self.repository forceUpdateRevisions];
 }
 
 - (void) updateView
@@ -513,10 +514,10 @@ - (void)closeView
 		[self.commitController removeObserver:self forKeyPath:@"arrangedObjects.@count"];
 		[self.treeController removeObserver:self forKeyPath:@"selection"];
 
-		[repository.revisionList removeObserver:self forKeyPath:@"isUpdating"];
-		[repository removeObserver:self forKeyPath:@"currentBranch"];
-		[repository removeObserver:self forKeyPath:@"refs"];
-		[repository removeObserver:self forKeyPath:@"currentBranchFilter"];
+		[self.repository.revisionList removeObserver:self forKeyPath:@"isUpdating"];
+		[self.repository removeObserver:self forKeyPath:@"currentBranch"];
+		[self.repository removeObserver:self forKeyPath:@"refs"];
+		[self.repository removeObserver:self forKeyPath:@"currentBranchFilter"];
 	}
 
 	[webHistoryController closeView];
@@ -551,7 +552,7 @@ - (void)showCommitsFromTree:(id)sender
 
 - (void)showInFinderAction:(id)sender
 {
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
+	NSString *workingDirectory = [[self.repository workingDirectory] stringByAppendingString:@"/"];
 	NSString *path;
 	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 
@@ -564,7 +565,7 @@ - (void)showInFinderAction:(id)sender
 
 - (void)openFilesAction:(id)sender
 {
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
+	NSString *workingDirectory = [[self.repository workingDirectory] stringByAppendingString:@"/"];
 	NSString *path;
 	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 
@@ -580,7 +581,7 @@ - (void) checkoutFiles:(id)sender
 	for (NSString *filePath in [sender representedObject])
 		[files addObject:[filePath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
 
-	[repository checkoutFiles:files fromRefish:selectedCommit];
+	[self.repository checkoutFiles:files fromRefish:selectedCommit];
 }
 
 - (void) diffFilesAction:(id)sender
@@ -609,10 +610,10 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 														 action:@selector(showCommitsFromTree:)
 												  keyEquivalent:@""];
 
-	PBGitRef *headRef = [[repository headRef] ref];
+	PBGitRef *headRef = [[self.repository headRef] ref];
 	NSString *headRefName = [headRef shortName];
 	NSString *diffTitle = [NSString stringWithFormat:@"Diff %@ with %@", multiple ? @"files" : @"file", headRefName];
-	BOOL isHead = [[selectedCommit sha] isEqual:[repository headSHA]];
+	BOOL isHead = [[selectedCommit sha] isEqual:[self.repository headSHA]];
 	NSMenuItem *diffItem = [[NSMenuItem alloc] initWithTitle:diffTitle
 													  action:isHead ? nil : @selector(diffFilesAction:)
 											   keyEquivalent:@""];
@@ -715,20 +716,22 @@ - (void)restoreSplitViewPositiion
 
 - (IBAction) createBranch:(id)sender
 {
-	PBGitRef *currentRef = [repository.currentBranch ref];
+	PBGitRef *currentRef = [self.repository.currentBranch ref];
 
-	if (!selectedCommit || [selectedCommit hasRef:currentRef])
+	if (!selectedCommit || [selectedCommit hasRef:currentRef]) {
 		[PBCreateBranchSheet beginCreateBranchSheetAtRefish:currentRef inRepository:self.repository];
-	else
+	} else {
 		[PBCreateBranchSheet beginCreateBranchSheetAtRefish:selectedCommit inRepository:self.repository];
+	}
 }
 
 - (IBAction) createTag:(id)sender
 {
-	if (!selectedCommit)
-		[PBCreateTagSheet beginCreateTagSheetAtRefish:[repository.currentBranch ref] inRepository:repository];
-	else
-		[PBCreateTagSheet beginCreateTagSheetAtRefish:selectedCommit inRepository:repository];
+	if (!selectedCommit) {
+		[PBCreateTagSheet beginCreateTagSheetAtRefish:[self.repository.currentBranch ref] inRepository:self.repository];
+	} else {
+		[PBCreateTagSheet beginCreateTagSheetAtRefish:selectedCommit inRepository:self.repository];
+	}
 }
 
 - (IBAction) showAddRemoteSheet:(id)sender
@@ -738,20 +741,23 @@ - (IBAction) showAddRemoteSheet:(id)sender
 
 - (IBAction) merge:(id)sender
 {
-	if (selectedCommit)
-		[repository mergeWithRefish:selectedCommit];
+	if (selectedCommit) {
+		[self.repository mergeWithRefish:selectedCommit];
+	}
 }
 
 - (IBAction) cherryPick:(id)sender
 {
-	if (selectedCommit)
-		[repository cherryPickRefish:selectedCommit];
+	if (selectedCommit) {
+		[self.repository cherryPickRefish:selectedCommit];
+	}
 }
 
 - (IBAction) rebase:(id)sender
 {
-	if (selectedCommit)
-		[repository rebaseBranch:nil onRefish:selectedCommit];
+	if (selectedCommit) {
+		[self.repository rebaseBranch:nil onRefish:selectedCommit];
+	}
 }
 
 #pragma mark -

Classes/Controllers/PBGitIndexController.m

@@ -10,6 +10,7 @@
 #import "PBChangedFile.h"
 #import "PBGitRepository.h"
 #import "PBGitIndex.h"
+#import "PBGitWindowController.h"
 
 #define FileChangesTableViewType @"GitFileChangedType"
 

Classes/Controllers/PBGitSidebarController.h

@@ -16,19 +16,13 @@
 @interface PBGitSidebarController : PBViewController<NSOutlineViewDelegate> {
 	IBOutlet NSWindow *window;
 	IBOutlet NSOutlineView *sourceView;
-	IBOutlet NSView *sourceListControlsView;
 	IBOutlet NSPopUpButton *actionButton;
 	IBOutlet NSSegmentedControl *remoteControls;
 
-	NSMutableArray *items;
-
 	/* Specific things */
 	PBSourceViewItem *stage;
 
 	PBSourceViewItem *branches, *remotes, *tags, *others, *submodules;
-
-	PBGitHistoryController *historyViewController;
-	PBGitCommitController *commitViewController;
 }
 
 - (void) selectStage;
@@ -41,9 +35,9 @@
 
 - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
 
-@property(readonly) NSMutableArray *items;
-@property(readonly) NSView *sourceListControlsView;
-@property(readonly) PBGitHistoryController *historyViewController;
-@property(readonly) PBGitCommitController *commitViewController;
+@property(nonatomic, strong, readonly) NSMutableArray *items;
+@property(nonatomic, strong) IBOutlet NSView *sourceListControlsView;
+@property(nonatomic, strong) IBOutlet PBGitHistoryController *historyViewController;
+@property(nonatomic, strong) IBOutlet PBGitCommitController *commitViewController;
 
 @end