svn commit: r433718 - in /incubator/cayenne/sandbox/CocoaCayenne/CAYClient: Artist.h Artist.m CAYPersistentObject.h CAYPersistentObject.m

[torehalset]

Author: torehalset
Date: Tue Aug 22 11:35:04 2006
New Revision: 433718

URL: http://svn.apache.org/viewvc?rev=433718&view=rev
Log:
store entity values in a NSMutableDictionary

Modified:
    incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h
    incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
    incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h
    incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h?rev=433718&r1=433717&r2=433718&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h Tue Aug 22 
11:35:04 2006
@@ -11,9 +11,6 @@
 
 @interface Artist : CAYPersistentObject {
 
-       NSString *name;
-    NSDate *dateOfBirth;
-
 }
 
 -(void)setName:(NSString *)n;

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m?rev=433718&r1=433717&r2=433718&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m Tue Aug 22 
11:35:04 2006
@@ -14,48 +14,36 @@
 -(id)initWithCoder:(NSCoder*)coder
 {
        [super initWithCoder:coder];
-       [self setName:[coder decodeObjectForKey:@"name"]];
-       [self setDateOfBirth:[coder decodeObjectForKey:@"dateOfBirth"]];
+       [values setObject:[coder decodeObjectForKey:@"name"] forKey:@"name"];
+       [values setObject:[coder decodeObjectForKey:@"dateOfBirth"] 
forKey:@"dateOfBirth"];
        return self;
 }
 
 -(void)encodeWithCoder:(NSCoder*)coder
 {
     [super encodeWithCoder:coder];
-       [coder encodeObject:name forKey:@"name"];
-       [coder encodeObject:dateOfBirth forKey:@"dateOfBirth"];
+       [coder encodeObject:[values valueForKey:@"name"] forKey:@"name"];
+       [coder encodeObject:[values valueForKey:@"dateOfBirth"] 
forKey:@"dateOfBirth"];
 }
 
 -(void)setName:(NSString *)n
 {
-       [n retain];
-       [name release];
-       name = n;
+    [values setObject:n forKey:@"name"];
 }
 
 -(NSString *)name
 {
-       return name;
+       return [values objectForKey:@"name"];
 }
 
 -(void)setDateOfBirth:(NSDate *)d
 {
-    [d retain];
-    [dateOfBirth release];
-    dateOfBirth = d;
+    [values setObject:d forKey:@"dateOfBirth"];
 }
 
 -(NSDate *)dateOfBirth
 {
-    return dateOfBirth;
+    return [values objectForKey:@"dateOfBirth"];
 }
-
--(void)dealloc
-{
-       [name release];
-    [dateOfBirth release];
-       [super dealloc];
-}
-
 
 @end

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h?rev=433718&r1=433717&r2=433718&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.h Tue 
Aug 22 11:35:04 2006
@@ -14,6 +14,7 @@
        CAYObjectId *objectId;
        unsigned int persistenceState;
        id objectContext;
+    NSMutableDictionary *values;
 }
 
 -(void)setObjectId:(CAYObjectId *)oid;

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m?rev=433718&r1=433717&r2=433718&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYPersistentObject.m Tue 
Aug 22 11:35:04 2006
@@ -16,6 +16,7 @@
 -(id)initWithCoder:(NSCoder*)coder
 {
        [super init];
+    values = [[NSMutableDictionary dictionary] retain];
        [self setObjectId:[coder decodeObjectForKey:@"objectId"]];
        return self;
 }
@@ -63,6 +64,7 @@
 {
        [objectId release];
        [objectContext release];
+    [values release];
        [super dealloc];
 }