Issue #13 - cleaning up ivar storage

Remove @synthesize & use self.

Author: rowanj

Classes/Controllers/PBGitCommitController.h

@@ -13,10 +13,6 @@
 @class PBNiceSplitView;
 
 @interface PBGitCommitController : PBViewController {
-	// This might have to transfer over to the PBGitRepository
-	// object sometime
-	PBGitIndex *index;
-	
 	IBOutlet NSTextView *commitMessageView;
 	IBOutlet NSArrayController *unstagedFilesController;
 	IBOutlet NSArrayController *cachedFilesController;
@@ -27,7 +23,7 @@
 	IBOutlet PBNiceSplitView *commitSplitView;
 }
 
-@property(readonly) PBGitIndex *index;
+@property(nonatomic, strong, readonly) PBGitIndex *index;
 
 - (IBAction) refresh:(id) sender;
 - (IBAction) commit:(id) sender;

Classes/Controllers/PBGitCommitController.m

@@ -20,6 +20,9 @@
 #define kCommitSplitViewPositionDefault @"Commit SplitView Position"
 
 @interface PBGitCommitController ()
+
+@property (nonatomic, strong) PBGitIndex *index;
+
 - (void)refreshFinished:(NSNotification *)notification;
 - (void)commitWithVerification:(BOOL) doVerify;
 - (void)commitStatusUpdated:(NSNotification *)notification;
@@ -34,24 +37,24 @@ - (void)saveCommitSplitViewPosition;
 
 @implementation PBGitCommitController
 
-@synthesize index;
-
 - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller
 {
-	if (!(self = [super initWithRepository:theRepository superController:controller]))
+	self = [super initWithRepository:theRepository superController:controller];
+	if (!self) {
 		return nil;
-
-	index = [[PBGitIndex alloc] initWithRepository:theRepository];
-	[index refresh];
-
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshFinished:) name:PBGitIndexFinishedIndexRefresh object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitStatusUpdated:) name:PBGitIndexCommitStatus object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitFinished:) name:PBGitIndexFinishedCommit object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitFailed:) name:PBGitIndexCommitFailed object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitHookFailed:) name:PBGitIndexCommitHookFailed object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(amendCommit:) name:PBGitIndexAmendMessageAvailable object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(indexChanged:) name:PBGitIndexIndexUpdated object:index];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(indexOperationFailed:) name:PBGitIndexOperationFailed object:index];
+	}
+	
+	self.index = [[PBGitIndex alloc] initWithRepository:theRepository];
+	[self.index refresh];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshFinished:) name:PBGitIndexFinishedIndexRefresh object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitStatusUpdated:) name:PBGitIndexCommitStatus object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitFinished:) name:PBGitIndexFinishedCommit object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitFailed:) name:PBGitIndexCommitFailed object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(commitHookFailed:) name:PBGitIndexCommitHookFailed object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(amendCommit:) name:PBGitIndexAmendMessageAvailable object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(indexChanged:) name:PBGitIndexIndexUpdated object:self.index];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(indexOperationFailed:) name:PBGitIndexOperationFailed object:self.index];
 
 	return self;
 }
@@ -123,7 +126,7 @@ - (void) refresh:(id) sender
 {
 	self.isBusy = YES;
 	self.status = @"Refreshing index…";
-	[index refresh];
+	[self.index refresh];
 
 	// Reload refs (in case HEAD changed)
 	[repository reloadRefs];
@@ -168,7 +171,7 @@ - (void) commitWithVerification:(BOOL) doVerify
 	self.isBusy = YES;
 	[commitMessageView setEditable:NO];
 
-	[index commitWithMessage:commitMessage andVerify:doVerify];
+	[self.index commitWithMessage:commitMessage andVerify:doVerify];
 }
 
 

Classes/Controllers/PBGitHistoryController.h

@@ -23,17 +23,12 @@
 @class PBHistorySearchController;
 
 @interface PBGitHistoryController : PBViewController {
-	IBOutlet PBRefController *refController;
 	IBOutlet NSSearchField *searchField;
-	IBOutlet NSArrayController* commitController;
-	IBOutlet NSTreeController* treeController;
 	IBOutlet NSOutlineView* fileBrowser;
 	NSArray *currentFileBrowserSelectionPath;
-	IBOutlet PBCommitList* commitList;
 	IBOutlet PBCollapsibleSplitView *historySplitView;
 	IBOutlet PBWebHistoryController *webHistoryController;
     QLPreviewPanel* previewPanel;
-	IBOutlet PBHistorySearchController *searchController;
 	IBOutlet GLFileView *fileView;
 
 	IBOutlet PBGitGradientBarView *upperToolbarView;
@@ -50,19 +45,17 @@
 	int selectedCommitDetailsIndex;
 	BOOL forceSelectionUpdate;
 
-	PBGitTree *gitTree;
-	PBGitCommit *webCommit;
 	PBGitCommit *selectedCommit;
 }
 
 @property (readonly) NSTreeController* treeController;
 @property (assign) int selectedCommitDetailsIndex;
 @property  PBGitCommit *webCommit;
 @property  PBGitTree* gitTree;
-@property (readonly) NSArrayController *commitController;
-@property (readonly) PBRefController *refController;
-@property (readonly) PBHistorySearchController *searchController;
-@property (readonly) PBCommitList *commitList;
+@property (nonatomic, strong) IBOutlet NSArrayController *commitController;
+@property (nonatomic, strong) IBOutlet PBRefController *refController;
+@property (nonatomic, strong) IBOutlet PBHistorySearchController *searchController;
+@property (nonatomic, strong) IBOutlet PBCommitList *commitList;
 
 - (IBAction) setDetailedView:(id)sender;
 - (IBAction) setTreeView:(id)sender;