From 4e87089af2ce50364a3e6fcfdf8a3c31e172d8aa Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 5 Dec 2010 15:03:28 +0000 Subject: Apply new favorites outline view patch. --- Source/SPFavoriteNode.m | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'Source/SPFavoriteNode.m') diff --git a/Source/SPFavoriteNode.m b/Source/SPFavoriteNode.m index 51a9d1aa..5c0d14c8 100644 --- a/Source/SPFavoriteNode.m +++ b/Source/SPFavoriteNode.m @@ -27,28 +27,51 @@ @implementation SPFavoriteNode -@synthesize nodeIsGroup; -@synthesize nodeName; @synthesize nodeFavorite; -@synthesize nodeChildren; + +#pragma mark - +#pragma mark Initialisation - (id)init { if ((self = [super init])) { - [self setNodeIsGroup:NO]; - [self setNodeName:nil]; [self setNodeFavorite:nil]; - [self setNodeChildren:[[NSMutableArray alloc] init]]; } return self; } +- (id)initWithDictionary:(NSDictionary *)dictionary +{ + if ((self = [self init])) { + [self setNodeFavorite:dictionary]; + } + + return self; +} + ++ (SPFavoriteNode *)favoriteNodeWithDictionary:(NSDictionary *)dictionary +{ + return [[[self alloc] initWithDictionary:dictionary] autorelease]; +} + +#pragma mark - +#pragma mark Copying protocol methods + +- (id)copyWithZone:(NSZone *)zone +{ + SPFavoriteNode *node = [[[self class] allocWithZone:zone] init]; + + [node setNodeFavorite:[[self nodeFavorite] copyWithZone:zone]]; + + return node; +} + +#pragma mark - + - (void)dealloc { - if (nodeName) [nodeName release], nodeName = nil; if (nodeFavorite) [nodeFavorite release], nodeFavorite = nil; - if (nodeChildren) [nodeChildren release], nodeChildren = nil; [super dealloc]; } -- cgit v1.2.3 From e1abafb0d9401c3b62c762921362effabe14f844 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 5 Dec 2010 19:00:55 +0000 Subject: Add description methods to tree node classes to aid debugging. --- Source/SPFavoriteNode.m | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Source/SPFavoriteNode.m') diff --git a/Source/SPFavoriteNode.m b/Source/SPFavoriteNode.m index 5c0d14c8..55a44653 100644 --- a/Source/SPFavoriteNode.m +++ b/Source/SPFavoriteNode.m @@ -67,6 +67,15 @@ return node; } + +#pragma mark - +#pragma mark Other + +- (NSString *)description +{ + return [NSString stringWithFormat:@"<%@: %p ('%@')>", [self className], self, [[self nodeFavorite] objectForKey:SPFavoriteNameKey]]; +} + #pragma mark - - (void)dealloc -- cgit v1.2.3 From 32b7c4df28e2eb3a4a8bcb71b3faae4f173f016c Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 5 Mar 2011 00:14:43 +0000 Subject: Add support for auto saving expanded items. --- Source/SPFavoriteNode.m | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'Source/SPFavoriteNode.m') diff --git a/Source/SPFavoriteNode.m b/Source/SPFavoriteNode.m index 55a44653..ee40f61f 100644 --- a/Source/SPFavoriteNode.m +++ b/Source/SPFavoriteNode.m @@ -25,6 +25,9 @@ #import "SPFavoriteNode.h" +// Constants +static const NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; + @implementation SPFavoriteNode @synthesize nodeFavorite; @@ -67,6 +70,24 @@ return node; } +#pragma mark - +#pragma mark Coding protocol methods + +- (id)initWithCoder:(NSCoder *)coder +{ + if ((self = [super initWithCoder:coder])) { + [self setNodeFavorite:[coder decodeObjectForKey:SPFavoriteNodeKey]]; + } + + return self; +} + +- (void)encodeWithCoder:(NSCoder *)coder +{ + [super encodeWithCoder:coder]; + + [coder encodeObject:[self nodeFavorite] forKey:SPFavoriteNodeKey]; +} #pragma mark - #pragma mark Other -- cgit v1.2.3 From 1632c45fdd9d0b8fe1e0aef3e891e8bd5704df29 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 13 Mar 2011 18:50:40 +0000 Subject: Fix issue related to dragging a node to a group node that is being renamed as well as fix all warnings related to the connection outlinew view. --- Source/SPFavoriteNode.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/SPFavoriteNode.m') diff --git a/Source/SPFavoriteNode.m b/Source/SPFavoriteNode.m index ee40f61f..a70823f7 100644 --- a/Source/SPFavoriteNode.m +++ b/Source/SPFavoriteNode.m @@ -23,10 +23,11 @@ // // More info at +#import "SPTreeNode.h" #import "SPFavoriteNode.h" // Constants -static const NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; +static NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; @implementation SPFavoriteNode @@ -44,7 +45,7 @@ static const NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; return self; } -- (id)initWithDictionary:(NSDictionary *)dictionary +- (id)initWithDictionary:(NSMutableDictionary *)dictionary { if ((self = [self init])) { [self setNodeFavorite:dictionary]; @@ -53,7 +54,7 @@ static const NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; return self; } -+ (SPFavoriteNode *)favoriteNodeWithDictionary:(NSDictionary *)dictionary ++ (SPFavoriteNode *)favoriteNodeWithDictionary:(NSMutableDictionary *)dictionary { return [[[self alloc] initWithDictionary:dictionary] autorelease]; } -- cgit v1.2.3 From 6d3f21336846d7745e795202c99390832c4220c8 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 19 Mar 2011 15:05:23 +0000 Subject: Bring outline view branch up to date with trunk (r3235:r3245), which should resolve all warnings. --- Source/SPFavoriteNode.m | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Source/SPFavoriteNode.m') diff --git a/Source/SPFavoriteNode.m b/Source/SPFavoriteNode.m index a70823f7..2d124756 100644 --- a/Source/SPFavoriteNode.m +++ b/Source/SPFavoriteNode.m @@ -76,17 +76,13 @@ static NSString *SPFavoriteNodeKey = @"SPFavoriteNode"; - (id)initWithCoder:(NSCoder *)coder { - if ((self = [super initWithCoder:coder])) { - [self setNodeFavorite:[coder decodeObjectForKey:SPFavoriteNodeKey]]; - } + [self setNodeFavorite:[coder decodeObjectForKey:SPFavoriteNodeKey]]; return self; } - (void)encodeWithCoder:(NSCoder *)coder -{ - [super encodeWithCoder:coder]; - +{ [coder encodeObject:[self nodeFavorite] forKey:SPFavoriteNodeKey]; } -- cgit v1.2.3