Modified: 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/project.pbxproj
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/project.pbxproj?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/project.pbxproj
 (original)
+++ 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/project.pbxproj
 Sun Aug 27 13:26:13 2006
@@ -25,6 +25,10 @@
                443968F80A90A0A2005BD842 /* Artist.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 443968F70A90A0A2005BD842 /* Artist.m */; };
                443968FB0A90A0C2005BD842 /* Painting.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 443968FA0A90A0C2005BD842 /* Painting.m */; };
                443968FE0A90A0D0005BD842 /* Gallery.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 443968FD0A90A0D0005BD842 /* Gallery.m */; };
+               443D27E00AA2276E0082552A /* CAYFault.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 443D27DF0AA2276E0082552A /* CAYFault.m */; };
+               443D27E30AA227830082552A /* CAYToManyFault.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 443D27E20AA227830082552A /* CAYToManyFault.m */; 
};
+               443D27E60AA227A10082552A /* CAYToOneFault.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 443D27E50AA227A10082552A /* CAYToOneFault.m */; 
};
+               443D28110AA22F560082552A /* CAYDataMap.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 443D28100AA22F560082552A /* CAYDataMap.m */; };
                44A6F8E10A965F1F00E04AE1 /* CAYObjEntity.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 44A6F8E00A965F1F00E04AE1 /* CAYObjEntity.m */; };
                44A6F8FA0A98EB5800E04AE1 /* CAYClientObjRelationship.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 44A6F8F90A98EB5800E04AE1 /* 
CAYClientObjRelationship.m */; };
                44DA7D960A9D017F0073B37F /* CAYNodePropertyChangeOperation.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 44DA7D950A9D017F0073B37F /* 
CAYNodePropertyChangeOperation.m */; };
@@ -82,6 +86,14 @@
                443968FA0A90A0C2005BD842 /* Painting.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= Painting.m; sourceTree = "<group>"; };
                443968FC0A90A0D0005BD842 /* Gallery.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
Gallery.h; sourceTree = "<group>"; };
                443968FD0A90A0D0005BD842 /* Gallery.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= Gallery.m; sourceTree = "<group>"; };
+               443D27DE0AA2276E0082552A /* CAYFault.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
CAYFault.h; sourceTree = "<group>"; };
+               443D27DF0AA2276E0082552A /* CAYFault.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CAYFault.m; sourceTree = "<group>"; };
+               443D27E10AA227830082552A /* CAYToManyFault.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
CAYToManyFault.h; sourceTree = "<group>"; };
+               443D27E20AA227830082552A /* CAYToManyFault.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CAYToManyFault.m; sourceTree = "<group>"; };
+               443D27E40AA227A10082552A /* CAYToOneFault.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
CAYToOneFault.h; sourceTree = "<group>"; };
+               443D27E50AA227A10082552A /* CAYToOneFault.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CAYToOneFault.m; sourceTree = "<group>"; };
+               443D280F0AA22F560082552A /* CAYDataMap.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
CAYDataMap.h; sourceTree = "<group>"; };
+               443D28100AA22F560082552A /* CAYDataMap.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CAYDataMap.m; sourceTree = "<group>"; };
                44A6F8DF0A965F1F00E04AE1 /* CAYObjEntity.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
CAYObjEntity.h; sourceTree = "<group>"; };
                44A6F8E00A965F1F00E04AE1 /* CAYObjEntity.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= CAYObjEntity.m; sourceTree = "<group>"; };
                44A6F8F80A98EB5800E04AE1 /* CAYClientObjRelationship.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = CAYClientObjRelationship.h; sourceTree = "<group>"; };
@@ -194,6 +206,7 @@
                443968F40A90A07F005BD842 /* cayenne */ = {
                        isa = PBXGroup;
                        children = (
+                               443D27DD0AA2275F0082552A /* fault */,
                                44DA7DC10A9D02C00073B37F /* message */,
                                44DA7D6E0A9D01620073B37F /* graph */,
                                443968460A9099AD005BD842 /* CAYObjectContext.h 
*/,
@@ -222,6 +235,8 @@
                                44A6F8E00A965F1F00E04AE1 /* CAYObjEntity.m */,
                                44A6F8F80A98EB5800E04AE1 /* 
CAYClientObjRelationship.h */,
                                44A6F8F90A98EB5800E04AE1 /* 
CAYClientObjRelationship.m */,
+                               443D280F0AA22F560082552A /* CAYDataMap.h */,
+                               443D28100AA22F560082552A /* CAYDataMap.m */,
                        );
                        name = cayenne;
                        sourceTree = "<group>";
@@ -239,6 +254,19 @@
                        name = tutorial;
                        sourceTree = "<group>";
                };
+               443D27DD0AA2275F0082552A /* fault */ = {
+                       isa = PBXGroup;
+                       children = (
+                               443D27DE0AA2276E0082552A /* CAYFault.h */,
+                               443D27DF0AA2276E0082552A /* CAYFault.m */,
+                               443D27E10AA227830082552A /* CAYToManyFault.h */,
+                               443D27E20AA227830082552A /* CAYToManyFault.m */,
+                               443D27E40AA227A10082552A /* CAYToOneFault.h */,
+                               443D27E50AA227A10082552A /* CAYToOneFault.m */,
+                       );
+                       name = fault;
+                       sourceTree = "<group>";
+               };
                44DA7D6E0A9D01620073B37F /* graph */ = {
                        isa = PBXGroup;
                        children = (
@@ -345,6 +373,10 @@
                                44DA7DA80A9D02010073B37F /* CAYNodeDiff.m in 
Sources */,
                                44DA7DBC0A9D02840073B37F /* CAYSyncMessage.m in 
Sources */,
                                44DA7F260A9E3EAA0073B37F /* CAYCompoundDiff.m 
in Sources */,
+                               443D27E00AA2276E0082552A /* CAYFault.m in 
Sources */,
+                               443D27E30AA227830082552A /* CAYToManyFault.m in 
Sources */,
+                               443D27E60AA227A10082552A /* CAYToOneFault.m in 
Sources */,
+                               443D28110AA22F560082552A /* CAYDataMap.m in 
Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.h?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.h (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.h Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,24 @@
+//
+//  CAYDataMap.h
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
[EMAIL PROTECTED] CAYDataMap : NSObject <NSCoding> {
+
+    NSString *name;
+    NSMutableDictionary *objEntityMap;
+
+}
+
+-(void)setName:(NSString *)n;
+-(NSString *)name;
+-(void)setObjEntityMap:(NSMutableDictionary *)oem;
+-(NSMutableDictionary *)objEntityMap;
+
[EMAIL PROTECTED]

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,59 @@
+//
+//  CAYDataMap.m
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import "CAYDataMap.h"
+
+
[EMAIL PROTECTED] CAYDataMap
+
+-(id)initWithCoder:(NSCoder*)coder
+{
+       [super init];
+       [self setName:[coder decodeObjectForKey:@"name"]];
+       [self setObjEntityMap:[coder decodeObjectForKey:@"objEntityMap"]];
+       return self;
+}
+
+-(void)encodeWithCoder:(NSCoder*)coder
+{
+       [coder encodeObject:name forKey:@"name"];
+       [coder encodeObject:objEntityMap forKey:@"objEntityMap"];
+}
+
+-(void)setName:(NSString *)n
+{
+       [n retain];
+       [name release];
+       name = n;
+}
+
+-(NSString *)name
+{
+       return name;
+}
+
+-(void)setObjEntityMap:(NSMutableDictionary *)oem
+{
+    [oem retain];
+    [objEntityMap release];
+    objEntityMap = oem;
+}
+
+-(NSMutableDictionary *)objEntityMap
+{
+    return objEntityMap;
+}
+
+-(void)dealloc
+{
+    [self setName:nil];
+    [self setObjEntityMap:nil];
+       [super dealloc];
+}
+
[EMAIL PROTECTED]

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h Sun 
Aug 27 13:26:13 2006
@@ -7,18 +7,18 @@
 //
 
 #import <Cocoa/Cocoa.h>
-
+#import "CAYObjEntity.h"
 
 @interface CAYEntityResolver : NSObject {
-    BOOL indexedByClass;
-       
-    NSDictionary *queryCache;
-    NSDictionary *dbEntityCache;
-    NSDictionary *objEntityCache;
-    NSDictionary *procedureCache;
     NSArray *maps;
-       NSDictionary *entityInheritanceCache;
-    CAYEntityResolver *clientEntityResolver;
+    NSMutableDictionary *classMapping;
 }
+
+-(void)setMaps:(NSArray *)m;
+-(NSArray *)maps;
+-(void)setClassMapping:(NSMutableDictionary *)cm;
+-(NSMutableDictionary *)classMapping;
+
+-(void)updateClassMapping;
 
 @end

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m Sun 
Aug 27 13:26:13 2006
@@ -7,8 +7,86 @@
 //
 
 #import "CAYEntityResolver.h"
-
+#import "CAYDataMap.h"
+#import "CAYObjEntity.h"
 
 @implementation CAYEntityResolver
+
+-(id)initWithCoder:(NSCoder*)coder
+{
+       [super init];
+       [self setMaps:[coder decodeObjectForKey:@"maps"]];
+       return self;
+}
+
+-(void)encodeWithCoder:(NSCoder*)coder
+{
+       [coder encodeObject:maps forKey:@"maps"];
+}
+
+-(void)setMaps:(NSArray *)m
+{
+    [m retain];
+    [maps release];
+    maps = m;
+}
+
+-(NSArray *)maps
+{
+    return maps;
+}
+
+-(void)setClassMapping:(NSMutableDictionary *)cm
+{
+    [cm retain];
+    [classMapping release];
+    classMapping = cm;
+}
+
+-(NSMutableDictionary *)classMapping
+{
+    return classMapping;
+}
+
+-(void)updateClassMapping
+{
+    NSMutableDictionary *cm = [NSMutableDictionary dictionary];
+    
+    // TODO: handle more than one map?
+    CAYDataMap *dataMap = [[self maps] objectAtIndex:0];
+    //NSLog(@"datamap.name: %@", [dataMap valueForKey:@"name"]);
+    NSMutableDictionary *objEntityMap = [dataMap objEntityMap];
+    
+    NSEnumerator *enumerator = [objEntityMap keyEnumerator];
+    NSString *entityName;
+    while(entityName = [enumerator nextObject])
+    {
+        if(![entityName isEqualToString:@"hessianClassName"])
+        {
+            CAYObjEntity *entity = [objEntityMap objectForKey:entityName];
+            
+            Class cl = NSClassFromString([entity name]);
+            if(cl)
+            {
+                NSLog(@"mapping client %@ to server %@", [entity name], 
[entity serverClassName]);
+                [cm setObject:[entity name] forKey:[entity serverClassName]];
+                
+            }
+            else
+            {
+                NSLog(@"Could not find cocoa class %@ for server class $@", 
[entity name], [entity serverClassName]);
+            }
+        } 
+    }
+    
+    [self setClassMapping:cm];
+}
+
+-(void)dealloc
+{
+    [self setMaps:nil];
+    [self setClassMapping:nil];
+       [super dealloc];
+}
 
 @end

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,27 @@
+//
+//  CAYFault.h
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "CAYPersistentObject.h"
+
[EMAIL PROTECTED] CAYFault : NSObject {
+
+    CAYPersistentObject *sourceObject;
+    NSString *relationshipName;
+    
+}
+
+-(id)initWithSourceObject:(CAYPersistentObject *)so relationshipName:(NSString 
*)rn;
+
+-(void)setSourceObject:(CAYPersistentObject *)so;
+-(CAYPersistentObject *)sourceObject;
+-(void)setRelationshipName:(NSString *)rn;
+-(NSString *)relationshipName;
+
+
[EMAIL PROTECTED]

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,57 @@
+//
+//  CAYFault.m
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import "CAYFault.h"
+
+
[EMAIL PROTECTED] CAYFault
+
+-(id)initWithSourceObject:(CAYPersistentObject *)so relationshipName:(NSString 
*)rn
+{
+    [super init];
+    if(self)
+    {
+        [self setSourceObject:so];
+        [self setRelationshipName:rn];
+    }
+    return self;
+}
+
+-(void)setSourceObject:(CAYPersistentObject *)so
+{
+    [so retain];
+    [sourceObject release];
+    sourceObject = so;
+}
+
+-(CAYPersistentObject *)sourceObject
+{
+    return sourceObject;
+}
+
+-(void)setRelationshipName:(NSString *)rn
+{
+    [rn retain];
+    [relationshipName release];
+    relationshipName = rn;
+}
+
+-(NSString *)relationshipName
+{
+    return relationshipName;
+}
+
+-(void)dealloc
+{
+    [self setSourceObject:nil];
+    [self setRelationshipName:nil];
+       [super dealloc];
+}
+
+
[EMAIL PROTECTED]

Modified: 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m Sun 
Aug 27 13:26:13 2006
@@ -13,12 +13,9 @@
 
 - (id) sendMessage:(CAYClientMessage *)message
 {
-       //[message retain];
        NSArray * parameters = [NSArray arrayWithObject:message];
     id result = [proxy callSynchronous:@"processMessage" 
withParameters:parameters];
-       //[message release];
        return result;
-       //return [result autorelease];
 }
 
 -(void) setProxy:(BBSHessianProxy *)p

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYNamedQuery.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYNamedQuery.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYNamedQuery.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYNamedQuery.m Sun Aug 27 
13:26:13 2006
@@ -53,8 +53,8 @@
 
 -(void)dealloc
 {
-       [name release];
-       [parameters release];
+    [self setName:nil];
+    [self setParameters:nil];
        [super dealloc];
 }
 

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.h?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.h 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.h Sun Aug 
27 13:26:13 2006
@@ -8,12 +8,14 @@
 
 #import <Cocoa/Cocoa.h>
 #import "CAYQuery.h"
+#import "CAYEntityResolver.h"
 
 @class CAYPersistentObject, CAYClientConnection;
 
 @interface CAYObjectContext : NSObject {
        CAYClientConnection *connection;
     NSMutableArray *diffs;
+    CAYEntityResolver *entityResolver;
 }
 
 -(NSArray *)performQyery:(CAYQuery *)q;
@@ -24,5 +26,8 @@
 -(void) propertyChanged:(CAYPersistentObject *)object forProperty:(NSString 
*)property fromOld:(NSObject *)oldValue toNew:(NSObject *)newValue;
 
 -(void)commitChanges;
+
+-(void)setEntityResolver:(CAYEntityResolver *)er;
+-(CAYEntityResolver *)entityResolver;
 
 @end

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m Sun Aug 
27 13:26:13 2006
@@ -35,7 +35,7 @@
        id result = [[self connection] sendMessage:queryMessage];
        [queryMessage release];
     
-       NSArray *results = [result results];
+    NSArray *results = [result results];
        NSArray *rows = [results objectAtIndex:0];
 
     // connect objects to the context
@@ -48,6 +48,10 @@
         {
             [row setObjectContext:self];
             // TODO: set initial persistant state
+            // TODO: check for existing objects in context with same ObjectId
+            
+            
+            
         }
     }
     
@@ -59,8 +63,8 @@
 {
     NSLog(@"prop %@ changed from %@ to %@", property, oldValue, newValue);
     
-    //CAYNodeDiff *diff = [[CAYNodePropertyChangeOperation alloc] 
initWithNodeId:[object objectId] property:property oldValue:oldValue 
newValue:newValue];
-    CAYNodePropertyChangeOperation *diff = [[CAYNodePropertyChangeOperation 
alloc] initWithNodeId:[object objectId] property:property oldValue:oldValue 
newValue:newValue];
+    CAYNodeDiff *diff = [[CAYNodePropertyChangeOperation alloc] 
initWithNodeId:[object objectId] property:property oldValue:oldValue 
newValue:newValue];
+    //CAYNodePropertyChangeOperation *diff = [[CAYNodePropertyChangeOperation 
alloc] initWithNodeId:[object objectId] property:property oldValue:oldValue 
newValue:newValue];
     [diffs addObject:diff];
     [diff release];
     NSLog(@"%i unsaved changes", [diffs count]);
@@ -95,10 +99,23 @@
     NSLog(@"%i unsaved changes after commit", [diffs count]);
 }
 
+-(void)setEntityResolver:(CAYEntityResolver *)er
+{
+    [er retain];
+    [entityResolver release];
+    entityResolver = er;
+}
+
+-(CAYEntityResolver *)entityResolver
+{
+    return entityResolver;
+}
+
 -(void)dealloc
 {
-       [connection release];
+       [self setConnection:nil];
     [diffs release];
+    [self setEntityResolver:nil];
        [super dealloc];
 }
 

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m 
(original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m Sun Aug 
27 13:26:13 2006
@@ -38,7 +38,7 @@
 
 -(void)dealloc
 {
-       [query release];
+    [self setQuery:nil];
        [super dealloc];
 }
 

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.h?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.h (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.h Sun Aug 
27 13:26:13 2006
@@ -0,0 +1,16 @@
+//
+//  CAYToManyFault.h
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "CAYFault.h"
+
[EMAIL PROTECTED] CAYToManyFault : CAYFault {
+
+}
+
[EMAIL PROTECTED]

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m Sun Aug 
27 13:26:13 2006
@@ -0,0 +1,14 @@
+//
+//  CAYToManyFault.m
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import "CAYToManyFault.h"
+
+
[EMAIL PROTECTED] CAYToManyFault
+
[EMAIL PROTECTED]

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.h
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.h?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.h (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.h Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,16 @@
+//
+//  CAYToOneFault.h
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "CAYFault.h"
+
[EMAIL PROTECTED] CAYToOneFault : CAYFault {
+
+}
+
[EMAIL PROTECTED]

Added: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m?rev=437454&view=auto
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m (added)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m Sun Aug 27 
13:26:13 2006
@@ -0,0 +1,14 @@
+//
+//  CAYToOneFault.m
+//  CAYClient
+//
+//  Created by Tore Halset on 8/27/06.
+//  Copyright 2006 __MyCompanyName__. All rights reserved.
+//
+
+#import "CAYToOneFault.h"
+
+
[EMAIL PROTECTED] CAYToOneFault
+
[EMAIL PROTECTED]

Modified: 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
 (original)
+++ 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
 Sun Aug 27 13:26:13 2006
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>451 147 356 240 0 0 1680 1028 </string>
+       <string>160 323 356 240 0 0 1680 1028 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
@@ -13,8 +13,8 @@
        <string>446.1</string>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
                <integer>29</integer>
+               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8J2135</string>

Modified: 
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
Binary files - no diff available.


Reply via email to