mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-05 15:03:19 +00:00
Monotone-Parent: 0245a6f30d464bb48c20bcb2fbc22fe527e5a47a
Monotone-Revision: 45f8f00965e4667aab6443560550ea1d92c6d11d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-04T22:25:27 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -41,8 +41,8 @@
|
||||
|
||||
@implementation SOGoContentObject
|
||||
|
||||
+ (SOGoContentObject *) objectWithRecord: (NSDictionary *) objectRecord
|
||||
inContainer: (SOGoGCSFolder *) newContainer
|
||||
+ (id) objectWithRecord: (NSDictionary *) objectRecord
|
||||
inContainer: (SOGoGCSFolder *) newContainer
|
||||
{
|
||||
SOGoContentObject *newObject;
|
||||
|
||||
@@ -53,6 +53,20 @@
|
||||
return newObject;
|
||||
}
|
||||
|
||||
+ (id) objectWithName: (NSDictionary *) objectRecord
|
||||
andContent: (NSString *) newContent
|
||||
inContainer: (SOGoGCSFolder *) newContainer
|
||||
{
|
||||
SOGoContentObject *newObject;
|
||||
|
||||
newObject = [[self alloc] initWithName: objectRecord
|
||||
andContent: newContent
|
||||
inContainer: newContainer];
|
||||
[newObject autorelease];
|
||||
|
||||
return newObject;
|
||||
}
|
||||
|
||||
// TODO: check superclass version
|
||||
|
||||
- (id) init
|
||||
@@ -69,7 +83,6 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
|
||||
- (void) _setRecord: (NSDictionary *) objectRecord
|
||||
{
|
||||
NSString *newContent;
|
||||
@@ -96,7 +109,7 @@
|
||||
NSString *newName;
|
||||
|
||||
newName = [objectRecord objectForKey: @"c_name"];
|
||||
if ((self = [super initWithName: newName inContainer: newContainer]))
|
||||
if ((self = [self initWithName: newName inContainer: newContainer]))
|
||||
{
|
||||
[self _setRecord: objectRecord];
|
||||
}
|
||||
@@ -104,6 +117,18 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (id) initWithName: (NSString *) newName
|
||||
andContent: (NSString *) newContent
|
||||
inContainer: (id) newContainer
|
||||
{
|
||||
if ((self = [self initWithName: newName inContainer: newContainer]))
|
||||
{
|
||||
ASSIGN (content, newContent);
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[content release];
|
||||
|
||||
Reference in New Issue
Block a user