Issue #13 - cleaning up ivar storage

rowanj · rowanj · commit 9571382479de · 2013-06-14T17:46:05.000+10:00
Remove @synthesize & use self.
diff --git a/Classes/git/PBGitRepositoryWatcher.h b/Classes/git/PBGitRepositoryWatcher.h
@@ -9,7 +9,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "PBGitRepository.h"
+
+@class PBGitRepository;
 
 typedef UInt32 PBGitRepositoryWatcherEventType;
 enum {
@@ -32,8 +33,6 @@ extern NSString *kPBGitRepositoryEventPathsUserInfoKey;
 	NSDictionary* lastStatus;
 }
 
-@property (readonly, weak) PBGitRepository *repository;
-
 - (id) initWithRepository:(PBGitRepository *)repository;
 - (void) start;
 - (void) stop;
diff --git a/Classes/git/PBGitRepositoryWatcher.m b/Classes/git/PBGitRepositoryWatcher.m
@@ -6,7 +6,10 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
 #import <CoreServices/CoreServices.h>
+
 #import "PBGitRepositoryWatcher.h"
+
+#import "PBGitRepository.h"
 #import "PBEasyPipe.h"
 #import "PBGitDefaults.h"
 #import "PBGitRepositoryWatcherEventPath.h"
@@ -18,6 +21,9 @@
 NSString *kPBGitRepositoryEventPathsUserInfoKey = @"kPBGitRepositoryEventPathsUserInfoKey";
 
 @interface PBGitRepositoryWatcher ()
+
+@property (readonly, weak) PBGitRepository *repository;
+
 - (void) _handleEventCallback:(NSArray *)eventPaths;
 @end
 
diff --git a/Classes/git/PBGitRepositoryWatcherEventPath.h b/Classes/git/PBGitRepositoryWatcherEventPath.h
@@ -10,11 +10,8 @@
 
 
 @interface PBGitRepositoryWatcherEventPath : NSObject
-{
-	NSString *path;
-	FSEventStreamEventFlags flag;
-}
 
-@property  NSString *path;
-@property (assign) FSEventStreamEventFlags flag;
+@property (nonatomic, assign) FSEventStreamEventFlags flag;
+@property (nonatomic, strong) NSString * path;
+
 @end
diff --git a/Classes/git/PBGitRepositoryWatcherEventPath.m b/Classes/git/PBGitRepositoryWatcherEventPath.m
@@ -10,6 +10,5 @@
 
 
 @implementation PBGitRepositoryWatcherEventPath
-@synthesize path, flag;
 
 @end
diff --git a/Classes/git/PBGitRevList.h b/Classes/git/PBGitRevList.h
@@ -12,22 +12,19 @@
 @class PBGitRevSpecifier;
 
 @interface PBGitRevList : NSObject {
-	NSMutableArray *commits;
-
 	__weak PBGitRepository *repository;
 	PBGitRevSpecifier *currentRev;
 	BOOL isGraphing;
 
 	NSThread *parseThread;
-	BOOL isParsing;
 	BOOL resetCommits;
 }
 
 - (id) initWithRepository:(PBGitRepository *)repo rev:(PBGitRevSpecifier *)rev shouldGraph:(BOOL)graph;
 - (void) loadRevisons;
 - (void)cancel;
 
-@property  NSMutableArray *commits;
-@property (readonly) BOOL isParsing;
+@property (nonatomic, assign, readonly) BOOL isParsing;
+@property (nonatomic, readonly) NSArray *commits;
 
 @end
diff --git a/Classes/git/PBGitRevList.mm b/Classes/git/PBGitRevList.mm
@@ -24,7 +24,8 @@
 
 @interface PBGitRevList ()
 
-@property (assign) BOOL isParsing;
+@property (nonatomic, strong) NSMutableArray *commitsRW;
+@property (nonatomic, assign) BOOL isParsing;
 
 @end
 
@@ -35,9 +36,6 @@ @interface PBGitRevList ()
 
 @implementation PBGitRevList
 
-@synthesize commits;
-@synthesize isParsing;
-
 
 - (id) initWithRepository:(PBGitRepository *)repo rev:(PBGitRevSpecifier *)rev shouldGraph:(BOOL)graph
 {
@@ -59,6 +57,10 @@ - (void) loadRevisons
 	[parseThread start];
 }
 
+- (NSArray*)commits
+{
+	return self.commitsRW;
+}
 
 - (void)cancel
 {
@@ -82,23 +84,23 @@ - (void) updateCommits:(NSDictionary *)update
 		return;
 
 	if (resetCommits) {
-		self.commits = [NSMutableArray array];
+		self.commitsRW = [NSMutableArray array];
 		resetCommits = NO;
 	}
 
-	NSRange range = NSMakeRange([commits count], [revisions count]);
+	NSRange range = NSMakeRange([self.commitsRW count], [revisions count]);
 	NSIndexSet *indexes = [NSIndexSet indexSetWithIndexesInRange:range];
 
 	[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:indexes forKey:@"commits"];
-	[commits addObjectsFromArray:revisions];
+	[self.commitsRW addObjectsFromArray:revisions];
 	[self didChange:NSKeyValueChangeInsertion valuesAtIndexes:indexes forKey:@"commits"];
 }
 
 
 - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 {
 	@autoreleasepool {
-		NSDate *start = [NSDate date];
+		//NSDate *start = [NSDate date];
 		NSDate *lastUpdate = [NSDate date];
 		NSMutableArray *revisions = [NSMutableArray array];
 		PBGitGrapher *g = [[PBGitGrapher alloc] initWithRepository:repository];
@@ -267,7 +269,7 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 		}
 		
 		if (![currentThread isCancelled]) {
-			NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:start];
+			//NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:start];
 			//NSLog(@"Loaded %i commits in %f seconds (%f/sec)", num, duration, num/duration);
 			
 			// Make sure the commits are stored before exiting.
diff --git a/Classes/git/PBGitRevSpecifier.h b/Classes/git/PBGitRevSpecifier.h
@@ -9,12 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PBGitRef.h"
 
-@interface PBGitRevSpecifier : NSObject  <NSCopying> {
-	NSString *description;
-	NSArray *parameters;
-	NSURL *workingDirectory;
-	BOOL isSimpleRef;
-}
+@interface PBGitRevSpecifier : NSObject  <NSCopying>
 
 - (id) initWithParameters:(NSArray *)params description:(NSString *)descrip;
 - (id) initWithParameters:(NSArray*) params;
@@ -33,9 +28,10 @@
 + (PBGitRevSpecifier *)allBranchesRevSpec;
 + (PBGitRevSpecifier *)localBranchesRevSpec;
 
-@property(retain)   NSString *description;
-@property(readonly) NSArray *parameters;
-@property(retain)   NSURL *workingDirectory;
-@property(readonly) BOOL isSimpleRef;
+@property(nonatomic, strong, readonly) NSString *description;
+@property(nonatomic, strong, readonly) NSArray *parameters;
+@property(nonatomic, assign, readonly) BOOL isSimpleRef;
+
+@property(nonatomic, strong) NSURL *workingDirectory;
 
 @end
diff --git a/Classes/git/PBGitRevSpecifier.m b/Classes/git/PBGitRevSpecifier.m
@@ -8,52 +8,56 @@
 
 #import "PBGitRevSpecifier.h"
 
+@interface PBGitRevSpecifier ()
 
-@implementation PBGitRevSpecifier
+@property(nonatomic, strong) NSString *description;
+@property(nonatomic, strong) NSArray *parameters;
+@property(nonatomic, assign) BOOL isSimpleRef;
 
-@synthesize parameters, description, workingDirectory;
-@synthesize isSimpleRef;
+@end
 
+@implementation PBGitRevSpecifier
 
 // internal designated init
 - (id) initWithParameters:(NSArray *)params description:(NSString *)descrip
 {
     self = [super init];
-	parameters = params;
-	description = descrip;
+	if (!self) {
+		return nil;
+	}
+	
+	self.parameters = params;
+	self.description = descrip;
 
-	if (([parameters count] > 1) || ([parameters count] == 0))
-		isSimpleRef =  NO;
+	if (([self.parameters count] > 1) || ([self.parameters count] == 0))
+		self.isSimpleRef =  NO;
 	else {
-		NSString *param = [parameters objectAtIndex:0];
+		NSString *param = [self.parameters objectAtIndex:0];
 		if ([param hasPrefix:@"-"] ||
 			[param rangeOfCharacterFromSet:[NSCharacterSet characterSetWithCharactersInString:@"^@{}~:"]].location != NSNotFound ||
 			[param rangeOfString:@".."].location != NSNotFound)
-			isSimpleRef =  NO;
+			self.isSimpleRef =  NO;
 		else
-			isSimpleRef =  YES;
+			self.isSimpleRef =  YES;
 	}
 
 	return self;
 }
 
 - (id) initWithParameters:(NSArray *)params
 {
-    self = [super init];
 	self = [self initWithParameters:params description:nil];
 	return self;
 }
 
 - (id) initWithRef:(PBGitRef *)ref
 {
-    self = [super init];
 	self = [self initWithParameters:[NSArray arrayWithObject:ref.ref] description:ref.shortName];
 	return self;
 }
 
 - (id) initWithCoder:(NSCoder *)coder
 {
-    self = [super init];
 	self = [self initWithParameters:[coder decodeObjectForKey:@"Parameters"] description:[coder decodeObjectForKey:@"Description"]];
 	return self;
 }
@@ -73,7 +77,7 @@ - (NSString*) simpleRef
 {
 	if (![self isSimpleRef])
 		return nil;
-	return [parameters objectAtIndex:0];
+	return [self.parameters objectAtIndex:0];
 }
 
 - (PBGitRef *) ref
@@ -86,18 +90,12 @@ - (PBGitRef *) ref
 
 - (NSString *) description
 {
-	if (!description)
-		return [parameters componentsJoinedByString:@" "];
-
-	return description;
-}
-
-- (void) setDescription:(NSString *)newDescription
-{
-	description = newDescription;
+	if (!self->_description) {
+		return [self.parameters componentsJoinedByString:@" "];
+	}
+	return self->_description;
 }
 
-
 - (NSString *) title
 {
 	NSString *title = nil;
@@ -122,17 +120,21 @@ - (NSString *) title
 
 - (BOOL) hasPathLimiter;
 {
-	for (NSString* param in parameters)
-		if ([param isEqualToString:@"--"])
+	for (NSString* param in self.parameters) {
+		if ([param isEqualToString:@"--"]) {
 			return YES;
+		}
+	}
 	return NO;
 }
 
 - (BOOL) hasLeftRight
 {
-	for (NSString* param in parameters)
-		if ([param isEqualToString:@"--left-right"])
+	for (NSString* param in self.parameters) {
+		if ([param isEqualToString:@"--left-right"]) {
 			return YES;
+		}
+	}
 	return NO;
 }
 
@@ -167,8 +169,8 @@ - (BOOL) isLocalBranchesRev
 
 - (void) encodeWithCoder:(NSCoder *)coder
 {
-	[coder encodeObject:description forKey:@"Description"];
-	[coder encodeObject:parameters forKey:@"Parameters"];
+	[coder encodeObject:self.description forKey:@"Description"];
+	[coder encodeObject:self.parameters forKey:@"Parameters"];
 }
 
 - (id)copyWithZone:(NSZone *)zone

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,5 @@`
`10`	`10`
`11`	`11`
`12`	`12`	`@implementation PBGitRepositoryWatcherEventPath`
`13`		`-@synthesize path, flag;`
`14`	`13`
`15`	`14`	`@end`