Author: torehalset Date: Sun Aug 27 13:26:13 2006 New Revision: 437454 URL: http://svn.apache.org/viewvc?rev=437454&view=rev Log: EntityResolver stuff. Started thinking about Faults..
Added:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYDataMap.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYFault.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToManyFault.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYToOneFault.m
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.pbxuser
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/project.pbxproj
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYEntityResolver.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYHessianConnection.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYNamedQuery.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.h
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYObjectContext.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYQueryMessage.m
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/info.nib
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/English.lproj/MainMenu.nib/keyedobjects.nib
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m Sun Aug 27
13:26:13 2006
@@ -6,6 +6,7 @@
#import "CAYObjectContext.h"
#import "CAYHessianConnection.h"
#import "CAYObjEntity.h"
+#import "CAYEntityResolver.h"
@implementation AppController
@@ -31,6 +32,8 @@
[classMapping setObject:@"CAYObjectId"
forKey:@"org.objectstyle.cayenne.ObjectId"];
[classMapping setObject:@"CAYObjEntity"
forKey:@"org.objectstyle.cayenne.map.ObjEntity"];
[classMapping setObject:@"CAYClientObjRelationship"
forKey:@"org.objectstyle.cayenne.map.ClientObjRelationship"];
+ [classMapping setObject:@"CAYEntityResolver"
forKey:@"org.objectstyle.cayenne.map.EntityResolver"];
+ [classMapping setObject:@"CAYDataMap"
forKey:@"org.objectstyle.cayenne.map.DataMap"];
// message
[classMapping setObject:@"CAYBootstrapMessage"
forKey:@"org.objectstyle.cayenne.remote.BootstrapMessage"];
@@ -58,50 +61,25 @@
[self setObjectContext:ctxt];
id result1 = [proxy callSynchronous:@"establishSession"
withParameters:nil];
- NSLog(@"result1 %@", result1);
+ NSLog(@"establishSession result: %@", result1);
+ // send bootstrap message to get the EntityResolver
CAYBootstrapMessage *bootstrapMsg = [[CAYBootstrapMessage alloc] init];
id bootresult = [conn sendMessage:bootstrapMsg];
- //NSLog(@"bootresult: %@", bootresult);
- [bootstrapMsg release];
-
- id datamaps = [bootresult valueForKey:@"maps"];
- // TODO: handle more than one map?
- id datamap = [datamaps objectAtIndex:0];
- NSLog(@"datamap.name: %@", [datamap valueForKey:@"name"]);
-
- id objEntityMap = [datamap valueForKey:@"objEntityMap"];
- // objEntityMap:
- // - key: Artist, value ObjEntity
- // objEntity:
- // - key: className, value: cayenne.tutorial.client.Artist
- // - key: "relationships", value: NSArray of ClientObjRelationship
- // ClientObjRelationship:
- // - key: "paintings",
-
- NSEnumerator *enumerator = [objEntityMap keyEnumerator];
- NSString *entityName;
- while(entityName = [enumerator nextObject])
+ if([bootresult isKindOfClass:[CAYEntityResolver class]])
{
- // TODO: create a CAYDataMap so that it is not mapped to a
NSDictionary with the special
- // hessianClassName entry
- if(![entityName isEqualToString:@"hessianClassName"])
- {
- // NSLog(@"found entity %@", entityName);
- CAYObjEntity *entity = [objEntityMap objectForKey:entityName];
-
- Class cl = NSClassFromString([entity name]);
- if(cl)
- {
- NSLog(@"mapping client %@ to server %@", [entity name],
[entity serverClassName]);
- [classMapping setObject:[entity name] forKey:[entity
serverClassName]];
- }
- else
- {
- NSLog(@"Could not find cocoa class %@ for server class
$@", [entity name], [entity serverClassName]);
- }
- }
+ CAYEntityResolver *resolver = (CAYEntityResolver *)bootresult;
+ [ctxt setEntityResolver:resolver];
}
+ else
+ {
+ NSLog(@"ERROR: bootstrap answer not of type CATEntityResolver, but
%@", [bootresult class]);
+ }
+ [bootstrapMsg release];
+
+ // update class mapping based on EntityResolver
+ [[ctxt entityResolver] updateClassMapping];
+ [classMapping addEntriesFromDictionary:[[ctxt entityResolver]
classMapping]];
// update class mapping
[BBSHessianProxy setClassMapping:classMapping];
@@ -112,14 +90,12 @@
}
CAYNamedQuery *query = [[CAYNamedQuery alloc] init];
[query setName:@"objcquery"];
-
NSArray *rows = [[self objectContext] performQyery:query];
-
+
[queryResultController removeObjects:[queryResultController
arrangedObjects]];
[queryResultController addObjects:rows];
[query release];
-
}
-(void)setObjectContext:(CAYObjectContext *)ctxt
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.h Sun Aug 27
13:26:13 2006
@@ -18,4 +18,6 @@
-(void)setDateOfBirth:(NSDate *)d;
-(NSDate *)dateOfBirth;
+-(NSArray *)paintings;
+
@end
Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/Artist.m Sun Aug 27
13:26:13 2006
@@ -48,4 +48,10 @@
return [values objectForKey:@"dateOfBirth"];
}
+-(NSArray *)paintings
+{
+ // TODO: create a fault here? or resolve it?
+ return [values objectForKey:@"paintings"];
+}
+
@end
Modified:
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
URL:
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1?rev=437454&r1=437453&r2=437454&view=diff
==============================================================================
---
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
(original)
+++
incubator/cayenne/sandbox/CocoaCayenne/CAYClient/CAYClient.xcodeproj/halset.mode1
Sun Aug 27 13:26:13 2006
@@ -258,6 +258,7 @@
<string>080E96DDFE201D6D7F000001</string>
<string>443968F50A90A08B005BD842</string>
<string>443968F40A90A07F005BD842</string>
+
<string>443D27DD0AA2275F0082552A</string>
<string>44DA7DC10A9D02C00073B37F</string>
<string>44DA7D6E0A9D01620073B37F</string>
<string>29B97315FDCFA39411CA2CEA</string>
@@ -268,14 +269,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
-
<integer>37</integer>
+
<integer>54</integer>
<integer>9</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {271,
789}}</string>
+ <string>{{0, 366},
{271, 789}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -294,7 +295,7 @@
<real>271</real>
</array>
<key>RubberWindowFrame</key>
- <string>46 180 1208 848 0 0
1680 1028 </string>
+ <string>451 160 1208 848 0 0
1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -312,7 +313,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>CAYObjectId.m</string>
+
<string>CAYEntityResolver.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -320,65 +321,73 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>CAYObjectId.m</string>
+
<string>CAYEntityResolver.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
-
<string>44DA81080A9E60490073B37F</string>
+
<string>44CFE74D0AA2368E00E28EA8</string>
<key>history</key>
<array>
<string>4417E2F50A908F5D000FE4DB</string>
<string>4417E2F60A908F5D000FE4DB</string>
-
<string>44A6F9160A98ECB300E04AE1</string>
<string>44A6F9180A98ECB300E04AE1</string>
<string>44A6FA160A98F94100E04AE1</string>
<string>44DA7B100A9A48030073B37F</string>
<string>44DA7B5E0A9A4EB20073B37F</string>
<string>44DA7B600A9A4EB20073B37F</string>
<string>44DA7B610A9A4EB20073B37F</string>
-
<string>44DA7BAF0A9A53E60073B37F</string>
-
<string>44DA7C770A9B9A150073B37F</string>
<string>44DA7CCB0A9B9E150073B37F</string>
<string>44DA7D100A9BA1B50073B37F</string>
-
<string>44DA7D140A9BA1B50073B37F</string>
-
<string>44DA7D160A9BA1B50073B37F</string>
-
<string>44DA7D170A9BA1B50073B37F</string>
<string>44DA7D620A9BA78A0073B37F</string>
-
<string>44DA7D700A9D016B0073B37F</string>
<string>44DA7D710A9D016B0073B37F</string>
<string>44DA7D720A9D016B0073B37F</string>
-
<string>44DA7D760A9D016B0073B37F</string>
<string>44DA7D780A9D016B0073B37F</string>
<string>44DA7D790A9D016B0073B37F</string>
<string>44DA7D7A0A9D016B0073B37F</string>
<string>44DA7D7B0A9D016B0073B37F</string>
<string>44DA7DDB0A9D03290073B37F</string>
-
<string>44DA7DF80A9D05270073B37F</string>
-
<string>44DA7DF90A9D05270073B37F</string>
-
<string>44DA7DFA0A9D05270073B37F</string>
<string>44DA7E2F0A9E34E90073B37F</string>
-
<string>44DA7ECD0A9E3C360073B37F</string>
<string>44DA7F940A9E43EF0073B37F</string>
-
<string>44DA7F950A9E43EF0073B37F</string>
<string>44DA7FA40A9E44150073B37F</string>
<string>44DA7FDC0A9E46C30073B37F</string>
<string>44DA7FE30A9E47080073B37F</string>
-
<string>44DA7FE40A9E47080073B37F</string>
-
<string>44DA80050A9E48230073B37F</string>
-
<string>44DA80140A9E48710073B37F</string>
-
<string>44DA80770A9E50590073B37F</string>
-
<string>44DA809A0A9E57DE0073B37F</string>
<string>44DA809B0A9E57DE0073B37F</string>
<string>44DA80C10A9E5C7C0073B37F</string>
<string>44DA80D40A9E5EEE0073B37F</string>
<string>44DA80D50A9E5EEE0073B37F</string>
-
<string>44DA80D60A9E5EEE0073B37F</string>
<string>44DA80E40A9E5F2A0073B37F</string>
-
<string>44DA80E50A9E5F2A0073B37F</string>
<string>44DA80EF0A9E5F9D0073B37F</string>
<string>44DA80F00A9E5F9D0073B37F</string>
-
<string>44DA80F10A9E5F9D0073B37F</string>
-
<string>44DA80F20A9E5F9D0073B37F</string>
+
<string>44FD35AC0A9FAC6300E07E44</string>
+
<string>446E1D3C0A9FBCF700E47FB0</string>
+
<string>446E1D3D0A9FBCF700E47FB0</string>
+
<string>446E1D5D0A9FBFCC00E47FB0</string>
+
<string>446E1D6E0A9FC15400E47FB0</string>
+
<string>446E1D740A9FC15400E47FB0</string>
+
<string>446E1DFC0A9FC6B300E47FB0</string>
+
<string>443D286A0AA235320082552A</string>
+
<string>443D286B0AA235320082552A</string>
+
<string>443D286C0AA235320082552A</string>
+
<string>443D286D0AA235320082552A</string>
+
<string>443D286E0AA235320082552A</string>
+
<string>443D286F0AA235320082552A</string>
+
<string>443D28700AA235320082552A</string>
+
<string>443D28710AA235320082552A</string>
+
<string>443D28720AA235320082552A</string>
+
<string>443D28730AA235320082552A</string>
+
<string>443D28740AA235320082552A</string>
+
<string>443D28750AA235320082552A</string>
+
<string>443D28760AA235320082552A</string>
+
<string>443D28770AA235320082552A</string>
+
<string>443D28780AA235320082552A</string>
+
<string>443D28790AA235320082552A</string>
+
<string>443D287A0AA235320082552A</string>
+
<string>443D287B0AA235320082552A</string>
+
<string>443D287D0AA235320082552A</string>
+
<string>443D28FE0AA2358F0082552A</string>
+
<string>44CFE7490AA2368E00E28EA8</string>
+
<string>44CFE74A0AA2368E00E28EA8</string>
+
<string>443D29060AA235EC0082552A</string>
</array>
<key>prevStack</key>
<array>
@@ -424,395 +433,26 @@
<string>44A6F9530A98ECB300E04AE1</string>
<string>44A6FA510A98F94100E04AE1</string>
<string>44DA7B660A9A4EB20073B37F</string>
-
<string>44DA7B8E0A9A52080073B37F</string>
-
<string>44DA7B8F0A9A52080073B37F</string>
-
<string>44DA7B900A9A52080073B37F</string>
-
<string>44DA7B910A9A52080073B37F</string>
<string>44DA7B920A9A52080073B37F</string>
-
<string>44DA7B930A9A52080073B37F</string>
<string>44DA7BA10A9A52720073B37F</string>
-
<string>44DA7BB20A9A53E60073B37F</string>
-
<string>44DA7BB30A9A53E60073B37F</string>
-
<string>44DA7BB40A9A53E60073B37F</string>
-
<string>44DA7BB50A9A53E60073B37F</string>
-
<string>44DA7BB60A9A53E60073B37F</string>
-
<string>44DA7BB70A9A53E60073B37F</string>
-
<string>44DA7BB80A9A53E60073B37F</string>
-
<string>44DA7BB90A9A53E60073B37F</string>
-
<string>44DA7BBA0A9A53E60073B37F</string>
-
<string>44DA7BD80A9A561E0073B37F</string>
-
<string>44DA7BD90A9A561E0073B37F</string>
-
<string>44DA7BDA0A9A561E0073B37F</string>
-
<string>44DA7BDB0A9A561E0073B37F</string>
-
<string>44DA7BDC0A9A561E0073B37F</string>
-
<string>44DA7BDD0A9A561E0073B37F</string>
-
<string>44DA7BDE0A9A561E0073B37F</string>
-
<string>44DA7BDF0A9A561E0073B37F</string>
-
<string>44DA7BE70A9A56D60073B37F</string>
-
<string>44DA7BE80A9A56D60073B37F</string>
-
<string>44DA7C070A9A58CC0073B37F</string>
-
<string>44DA7C080A9A58CC0073B37F</string>
-
<string>44DA7C090A9A58CC0073B37F</string>
-
<string>44DA7C0A0A9A58CC0073B37F</string>
-
<string>44DA7C0B0A9A58CC0073B37F</string>
-
<string>44DA7C0C0A9A58CC0073B37F</string>
-
<string>44DA7C0D0A9A58CC0073B37F</string>
-
<string>44DA7C0E0A9A58CC0073B37F</string>
-
<string>44DA7C0F0A9A58CC0073B37F</string>
-
<string>44DA7C100A9A58CC0073B37F</string>
-
<string>44DA7C110A9A58CC0073B37F</string>
-
<string>44DA7C120A9A58CC0073B37F</string>
-
<string>44DA7C1F0A9A59550073B37F</string>
-
<string>44DA7C200A9A59550073B37F</string>
-
<string>44DA7C210A9A59550073B37F</string>
-
<string>44DA7C220A9A59550073B37F</string>
-
<string>44DA7C330A9A5AA10073B37F</string>
-
<string>44DA7C340A9A5AA10073B37F</string>
-
<string>44DA7C350A9A5AA10073B37F</string>
-
<string>44DA7C360A9A5AA10073B37F</string>
-
<string>44DA7C370A9A5AA10073B37F</string>
-
<string>44DA7C380A9A5AA10073B37F</string>
-
<string>44DA7C390A9A5AA10073B37F</string>
-
<string>44DA7C3E0A9A5AB30073B37F</string>
-
<string>44DA7C3F0A9A5AB30073B37F</string>
-
<string>44DA7C400A9A5AB30073B37F</string>
-
<string>44DA7C410A9A5AB30073B37F</string>
-
<string>44DA7C420A9A5AB30073B37F</string>
-
<string>44DA7C560A9B85060073B37F</string>
-
<string>44DA7C570A9B85060073B37F</string>
-
<string>44DA7C580A9B85060073B37F</string>
-
<string>44DA7C590A9B85060073B37F</string>
-
<string>44DA7C5A0A9B85060073B37F</string>
-
<string>44DA7C5B0A9B85060073B37F</string>
-
<string>44DA7C660A9B856E0073B37F</string>
-
<string>44DA7C670A9B856E0073B37F</string>
-
<string>44DA7C7A0A9B9A150073B37F</string>
-
<string>44DA7C7B0A9B9A150073B37F</string>
-
<string>44DA7C7C0A9B9A150073B37F</string>
-
<string>44DA7C7D0A9B9A150073B37F</string>
-
<string>44DA7C7E0A9B9A150073B37F</string>
-
<string>44DA7C7F0A9B9A150073B37F</string>
-
<string>44DA7C800A9B9A150073B37F</string>
-
<string>44DA7C8E0A9B9AC70073B37F</string>
-
<string>44DA7C950A9B9C500073B37F</string>
-
<string>44DA7C960A9B9C500073B37F</string>
-
<string>44DA7CA30A9B9CEA0073B37F</string>
-
<string>44DA7CA40A9B9CEA0073B37F</string>
-
<string>44DA7CA50A9B9CEA0073B37F</string>
-
<string>44DA7CB30A9B9D710073B37F</string>
-
<string>44DA7CB40A9B9D710073B37F</string>
-
<string>44DA7CBA0A9B9DA40073B37F</string>
-
<string>44DA7CCC0A9B9E150073B37F</string>
-
<string>44DA7CCD0A9B9E150073B37F</string>
-
<string>44DA7CCE0A9B9E150073B37F</string>
-
<string>44DA7CCF0A9B9E150073B37F</string>
-
<string>44DA7CD00A9B9E150073B37F</string>
-
<string>44DA7CD70A9B9E540073B37F</string>
-
<string>44DA7CE30A9B9E990073B37F</string>
-
<string>44DA7CFF0A9BA0AC0073B37F</string>
-
<string>44DA7D1C0A9BA1B50073B37F</string>
-
<string>44DA7D1D0A9BA1B50073B37F</string>
-
<string>44DA7D1E0A9BA1B50073B37F</string>
-
<string>44DA7D1F0A9BA1B50073B37F</string>
-
<string>44DA7D200A9BA1B50073B37F</string>
-
<string>44DA7D210A9BA1B50073B37F</string>
-
<string>44DA7D220A9BA1B50073B37F</string>
-
<string>44DA7D230A9BA1B50073B37F</string>
-
<string>44DA7D240A9BA1B50073B37F</string>
-
<string>44DA7D250A9BA1B50073B37F</string>
-
<string>44DA7D260A9BA1B50073B37F</string>
-
<string>44DA7D270A9BA1B50073B37F</string>
-
<string>44DA7D280A9BA1B50073B37F</string>
-
<string>44DA7D290A9BA1B50073B37F</string>
-
<string>44DA7D2A0A9BA1B50073B37F</string>
-
<string>44DA7D2B0A9BA1B50073B37F</string>
-
<string>44DA7D2C0A9BA1B50073B37F</string>
-
<string>44DA7D2D0A9BA1B50073B37F</string>
-
<string>44DA7D2E0A9BA1B50073B37F</string>
-
<string>44DA7D340A9BA3E30073B37F</string>
-
<string>44DA7D350A9BA3E30073B37F</string>
-
<string>44DA7D3E0A9BA5150073B37F</string>
-
<string>44DA7D480A9BA5C20073B37F</string>
-
<string>44DA7D490A9BA5C20073B37F</string>
-
<string>44DA7D4A0A9BA5C20073B37F</string>
-
<string>44DA7D540A9BA6000073B37F</string>
-
<string>44DA7D550A9BA6000073B37F</string>
-
<string>44DA7D560A9BA6000073B37F</string>
-
<string>44DA7D5C0A9BA62F0073B37F</string>
-
<string>44DA7D630A9BA78A0073B37F</string>
-
<string>44DA7D640A9BA78A0073B37F</string>
-
<string>44DA7D650A9BA78A0073B37F</string>
-
<string>44DA7D7F0A9D016B0073B37F</string>
-
<string>44DA7D800A9D016B0073B37F</string>
-
<string>44DA7D810A9D016B0073B37F</string>
-
<string>44DA7D820A9D016B0073B37F</string>
-
<string>44DA7D830A9D016B0073B37F</string>
-
<string>44DA7D840A9D016B0073B37F</string>
-
<string>44DA7D850A9D016B0073B37F</string>
-
<string>44DA7D860A9D016B0073B37F</string>
-
<string>44DA7D870A9D016B0073B37F</string>
-
<string>44DA7D880A9D016B0073B37F</string>
-
<string>44DA7D890A9D016B0073B37F</string>
-
<string>44DA7D8A0A9D016B0073B37F</string>
-
<string>44DA7D8B0A9D016B0073B37F</string>
-
<string>44DA7D8C0A9D016B0073B37F</string>
-
<string>44DA7D8D0A9D016B0073B37F</string>
-
<string>44DA7D8E0A9D016B0073B37F</string>
-
<string>44DA7D8F0A9D016B0073B37F</string>
-
<string>44DA7D900A9D016B0073B37F</string>
-
<string>44DA7D910A9D016B0073B37F</string>
-
<string>44DA7D920A9D016B0073B37F</string>
-
<string>44DA7D9F0A9D01D80073B37F</string>
<string>44DA7DA00A9D01D80073B37F</string>
<string>44DA7DA10A9D01D80073B37F</string>
-
<string>44DA7DA20A9D01D80073B37F</string>
-
<string>44DA7DAF0A9D02190073B37F</string>
<string>44DA7DB00A9D02190073B37F</string>
<string>44DA7DB10A9D02190073B37F</string>
-
<string>44DA7DB20A9D02190073B37F</string>
-
<string>44DA7DB80A9D022E0073B37F</string>
-
<string>44DA7DCC0A9D030C0073B37F</string>
<string>44DA7DCD0A9D030C0073B37F</string>
-
<string>44DA7DCE0A9D030C0073B37F</string>
-
<string>44DA7DCF0A9D030C0073B37F</string>
-
<string>44DA7DD00A9D030C0073B37F</string>
-
<string>44DA7DD10A9D030C0073B37F</string>
-
<string>44DA7DD20A9D030C0073B37F</string>
-
<string>44DA7DD30A9D030C0073B37F</string>
-
<string>44DA7DD40A9D030C0073B37F</string>
-
<string>44DA7DD50A9D030C0073B37F</string>
-
<string>44DA7DD60A9D030C0073B37F</string>
<string>44DA7DD70A9D030C0073B37F</string>
-
<string>44DA7DDE0A9D03290073B37F</string>
-
<string>44DA7DDF0A9D03290073B37F</string>
-
<string>44DA7DE00A9D03290073B37F</string>
-
<string>44DA7DE10A9D03290073B37F</string>
-
<string>44DA7E000A9D05270073B37F</string>
-
<string>44DA7E010A9D05270073B37F</string>
-
<string>44DA7E020A9D05270073B37F</string>
-
<string>44DA7E030A9D05270073B37F</string>
-
<string>44DA7E040A9D05270073B37F</string>
-
<string>44DA7E050A9D05270073B37F</string>
-
<string>44DA7E060A9D05270073B37F</string>
-
<string>44DA7E070A9D05270073B37F</string>
-
<string>44DA7E080A9D05270073B37F</string>
-
<string>44DA7E090A9D05270073B37F</string>
-
<string>44DA7E0A0A9D05270073B37F</string>
-
<string>44DA7E0B0A9D05270073B37F</string>
-
<string>44DA7E0C0A9D05270073B37F</string>
-
<string>44DA7E0D0A9D05270073B37F</string>
-
<string>44DA7E0E0A9D05270073B37F</string>
-
<string>44DA7E0F0A9D05270073B37F</string>
-
<string>44DA7E100A9D05270073B37F</string>
-
<string>44DA7E110A9D05270073B37F</string>
-
<string>44DA7E120A9D05270073B37F</string>
-
<string>44DA7E130A9D05270073B37F</string>
-
<string>44DA7E140A9D05270073B37F</string>
-
<string>44DA7E150A9D05270073B37F</string>
-
<string>44DA7E160A9D05270073B37F</string>
-
<string>44DA7E170A9D05270073B37F</string>
-
<string>44DA7E180A9D05270073B37F</string>
-
<string>44DA7E190A9D05270073B37F</string>
-
<string>44DA7E1A0A9D05270073B37F</string>
-
<string>44DA7E1B0A9D05270073B37F</string>
-
<string>44DA7E1C0A9D05270073B37F</string>
-
<string>44DA7E1D0A9D05270073B37F</string>
-
<string>44DA7E1E0A9D05270073B37F</string>
-
<string>44DA7E330A9E34E90073B37F</string>
-
<string>44DA7E340A9E34E90073B37F</string>
-
<string>44DA7E350A9E34E90073B37F</string>
-
<string>44DA7E360A9E34E90073B37F</string>
-
<string>44DA7E370A9E34E90073B37F</string>
-
<string>44DA7E380A9E34E90073B37F</string>
-
<string>44DA7E390A9E34E90073B37F</string>
-
<string>44DA7E3A0A9E34E90073B37F</string>
-
<string>44DA7E3B0A9E34E90073B37F</string>
-
<string>44DA7E3C0A9E34E90073B37F</string>
-
<string>44DA7E3D0A9E34E90073B37F</string>
-
<string>44DA7E3E0A9E34E90073B37F</string>
-
<string>44DA7E3F0A9E34E90073B37F</string>
-
<string>44DA7E400A9E34E90073B37F</string>
-
<string>44DA7E410A9E34E90073B37F</string>
-
<string>44DA7E420A9E34E90073B37F</string>
-
<string>44DA7E430A9E34E90073B37F</string>
-
<string>44DA7E440A9E34E90073B37F</string>
-
<string>44DA7E450A9E34E90073B37F</string>
-
<string>44DA7E460A9E34E90073B37F</string>
-
<string>44DA7E470A9E34E90073B37F</string>
-
<string>44DA7E480A9E34E90073B37F</string>
-
<string>44DA7E490A9E34E90073B37F</string>
-
<string>44DA7E4A0A9E34E90073B37F</string>
-
<string>44DA7E4B0A9E34E90073B37F</string>
-
<string>44DA7E610A9E38180073B37F</string>
-
<string>44DA7E620A9E38180073B37F</string>
-
<string>44DA7E630A9E38180073B37F</string>
-
<string>44DA7E640A9E38180073B37F</string>
-
<string>44DA7E650A9E38180073B37F</string>
-
<string>44DA7E660A9E38180073B37F</string>
-
<string>44DA7E670A9E38180073B37F</string>
-
<string>44DA7E680A9E38180073B37F</string>
-
<string>44DA7E690A9E38180073B37F</string>
-
<string>44DA7E6A0A9E38180073B37F</string>
-
<string>44DA7E6B0A9E38180073B37F</string>
-
<string>44DA7E6C0A9E38180073B37F</string>
-
<string>44DA7E6D0A9E38180073B37F</string>
-
<string>44DA7E6E0A9E38180073B37F</string>
-
<string>44DA7E6F0A9E38180073B37F</string>
-
<string>44DA7E700A9E38180073B37F</string>
-
<string>44DA7E710A9E38180073B37F</string>
-
<string>44DA7E720A9E38180073B37F</string>
-
<string>44DA7E730A9E38180073B37F</string>
-
<string>44DA7E740A9E38180073B37F</string>
-
<string>44DA7E750A9E38180073B37F</string>
-
<string>44DA7E760A9E38180073B37F</string>
-
<string>44DA7E770A9E38180073B37F</string>
-
<string>44DA7E780A9E38180073B37F</string>
-
<string>44DA7E790A9E38180073B37F</string>
-
<string>44DA7E7A0A9E38180073B37F</string>
-
<string>44DA7E7B0A9E38180073B37F</string>
-
<string>44DA7E7C0A9E38180073B37F</string>
-
<string>44DA7E7D0A9E38180073B37F</string>
-
<string>44DA7E7E0A9E38180073B37F</string>
-
<string>44DA7E7F0A9E38180073B37F</string>
-
<string>44DA7E800A9E38180073B37F</string>
-
<string>44DA7EB50A9E3AB00073B37F</string>
-
<string>44DA7EB60A9E3AB00073B37F</string>
-
<string>44DA7EB70A9E3AB00073B37F</string>
-
<string>44DA7EB80A9E3AB00073B37F</string>
-
<string>44DA7EB90A9E3AB00073B37F</string>
-
<string>44DA7EBA0A9E3AB00073B37F</string>
-
<string>44DA7EBB0A9E3AB00073B37F</string>
-
<string>44DA7EC50A9E3B470073B37F</string>
-
<string>44DA7ECF0A9E3C360073B37F</string>
-
<string>44DA7ED00A9E3C360073B37F</string>
-
<string>44DA7ED10A9E3C360073B37F</string>
-
<string>44DA7ED20A9E3C360073B37F</string>
-
<string>44DA7ED30A9E3C360073B37F</string>
-
<string>44DA7EE20A9E3D150073B37F</string>
-
<string>44DA7EE30A9E3D150073B37F</string>
-
<string>44DA7EE40A9E3D150073B37F</string>
-
<string>44DA7EE50A9E3D150073B37F</string>
-
<string>44DA7EE60A9E3D150073B37F</string>
-
<string>44DA7EE70A9E3D150073B37F</string>
-
<string>44DA7EF50A9E3D840073B37F</string>
-
<string>44DA7EF60A9E3D840073B37F</string>
-
<string>44DA7F1A0A9E3E450073B37F</string>
-
<string>44DA7F1B0A9E3E450073B37F</string>
-
<string>44DA7F1C0A9E3E450073B37F</string>
-
<string>44DA7F1D0A9E3E450073B37F</string>
-
<string>44DA7F1E0A9E3E450073B37F</string>
-
<string>44DA7F1F0A9E3E450073B37F</string>
-
<string>44DA7F200A9E3E450073B37F</string>
-
<string>44DA7F210A9E3E450073B37F</string>
-
<string>44DA7F220A9E3E450073B37F</string>
-
<string>44DA7F2E0A9E3ECA0073B37F</string>
<string>44DA7F2F0A9E3ECA0073B37F</string>
-
<string>44DA7F300A9E3ECA0073B37F</string>
-
<string>44DA7F4D0A9E41030073B37F</string>
-
<string>44DA7F4E0A9E41030073B37F</string>
<string>44DA7F4F0A9E41030073B37F</string>
-
<string>44DA7F500A9E41030073B37F</string>
-
<string>44DA7F510A9E41030073B37F</string>
-
<string>44DA7F520A9E41030073B37F</string>
-
<string>44DA7F530A9E41030073B37F</string>
-
<string>44DA7F540A9E41030073B37F</string>
-
<string>44DA7F550A9E41030073B37F</string>
-
<string>44DA7F560A9E41030073B37F</string>
-
<string>44DA7F570A9E41030073B37F</string>
-
<string>44DA7F580A9E41030073B37F</string>
-
<string>44DA7F820A9E43560073B37F</string>
-
<string>44DA7F830A9E43560073B37F</string>
-
<string>44DA7F840A9E43560073B37F</string>
-
<string>44DA7F850A9E43560073B37F</string>
-
<string>44DA7F860A9E43560073B37F</string>
-
<string>44DA7F870A9E43560073B37F</string>
-
<string>44DA7F880A9E43560073B37F</string>
-
<string>44DA7F890A9E43560073B37F</string>
-
<string>44DA7F970A9E43EF0073B37F</string>
-
<string>44DA7F980A9E43EF0073B37F</string>
-
<string>44DA7F990A9E43EF0073B37F</string>
-
<string>44DA7F9A0A9E43EF0073B37F</string>
-
<string>44DA7F9B0A9E43EF0073B37F</string>
-
<string>44DA7F9C0A9E43EF0073B37F</string>
-
<string>44DA7F9D0A9E43EF0073B37F</string>
-
<string>44DA7FA70A9E44150073B37F</string>
-
<string>44DA7FA80A9E44150073B37F</string>
-
<string>44DA7FA90A9E44150073B37F</string>
-
<string>44DA7FCC0A9E469F0073B37F</string>
-
<string>44DA7FCD0A9E469F0073B37F</string>
-
<string>44DA7FCE0A9E469F0073B37F</string>
-
<string>44DA7FCF0A9E469F0073B37F</string>
-
<string>44DA7FD00A9E469F0073B37F</string>
-
<string>44DA7FD10A9E469F0073B37F</string>
-
<string>44DA7FD20A9E469F0073B37F</string>
-
<string>44DA7FD30A9E469F0073B37F</string>
-
<string>44DA7FD40A9E469F0073B37F</string>
-
<string>44DA7FD50A9E469F0073B37F</string>
-
<string>44DA7FD60A9E469F0073B37F</string>
-
<string>44DA7FDD0A9E46C30073B37F</string>
-
<string>44DA7FDE0A9E46C30073B37F</string>
-
<string>44DA7FE50A9E47080073B37F</string>
-
<string>44DA7FE60A9E47080073B37F</string>
-
<string>44DA7FEF0A9E47870073B37F</string>
-
<string>44DA7FF00A9E47870073B37F</string>
-
<string>44DA7FF90A9E47E40073B37F</string>
-
<string>44DA80060A9E48230073B37F</string>
-
<string>44DA80070A9E48230073B37F</string>
-
<string>44DA80160A9E48710073B37F</string>
-
<string>44DA80390A9E4B9B0073B37F</string>
-
<string>44DA803A0A9E4B9B0073B37F</string>
-
<string>44DA803B0A9E4B9B0073B37F</string>
-
<string>44DA803C0A9E4B9B0073B37F</string>
-
<string>44DA803D0A9E4B9B0073B37F</string>
-
<string>44DA80490A9E4C490073B37F</string>
-
<string>44DA804A0A9E4C490073B37F</string>
-
<string>44DA80520A9E4CE60073B37F</string>
-
<string>44DA80530A9E4CE60073B37F</string>
-
<string>44DA805B0A9E4D420073B37F</string>
-
<string>44DA805C0A9E4D420073B37F</string>
-
<string>44DA805D0A9E4D420073B37F</string>
-
<string>44DA805E0A9E4D420073B37F</string>
-
<string>44DA80680A9E4DB70073B37F</string>
-
<string>44DA80690A9E4DB70073B37F</string>
-
<string>44DA806A0A9E4DB70073B37F</string>
-
<string>44DA806B0A9E4DB70073B37F</string>
-
<string>44DA806C0A9E4DB70073B37F</string>
-
<string>44DA806D0A9E4DB70073B37F</string>
-
<string>44DA806E0A9E4DB70073B37F</string>
-
<string>44DA806F0A9E4DB70073B37F</string>
-
<string>44DA807B0A9E50590073B37F</string>
-
<string>44DA807C0A9E50590073B37F</string>
-
<string>44DA807D0A9E50590073B37F</string>
-
<string>44DA807E0A9E50590073B37F</string>
-
<string>44DA807F0A9E50590073B37F</string>
-
<string>44DA808E0A9E521C0073B37F</string>
-
<string>44DA809E0A9E57DE0073B37F</string>
-
<string>44DA809F0A9E57DE0073B37F</string>
-
<string>44DA80A00A9E57DE0073B37F</string>
-
<string>44DA80A10A9E57DE0073B37F</string>
-
<string>44DA80A80A9E59460073B37F</string>
-
<string>44DA80A90A9E59460073B37F</string>
-
<string>44DA80B90A9E5C4C0073B37F</string>
-
<string>44DA80BA0A9E5C4C0073B37F</string>
-
<string>44DA80BB0A9E5C4C0073B37F</string>
-
<string>44DA80BC0A9E5C4C0073B37F</string>
-
<string>44DA80BD0A9E5C4C0073B37F</string>
-
<string>44DA80C20A9E5C7C0073B37F</string>
-
<string>44DA80D80A9E5EEE0073B37F</string>
-
<string>44DA80D90A9E5EEE0073B37F</string>
-
<string>44DA80DA0A9E5EEE0073B37F</string>
-
<string>44DA80DB0A9E5EEE0073B37F</string>
-
<string>44DA80DC0A9E5EEE0073B37F</string>
-
<string>44DA80DD0A9E5EEE0073B37F</string>
-
<string>44DA80DE0A9E5EEE0073B37F</string>
-
<string>44DA80E60A9E5F2A0073B37F</string>
-
<string>44DA80E70A9E5F2A0073B37F</string>
-
<string>44DA80F30A9E5F9D0073B37F</string>
-
<string>44DA80F40A9E5F9D0073B37F</string>
-
<string>44DA80F50A9E5F9D0073B37F</string>
-
<string>44DA80F60A9E5F9D0073B37F</string>
-
<string>44DA80F70A9E5F9D0073B37F</string>
-
<string>44DA80F80A9E5F9D0073B37F</string>
+
<string>443D28960AA235320082552A</string>
+
<string>443D28970AA235320082552A</string>
+
<string>443D28980AA235320082552A</string>
+
<string>443D28990AA235320082552A</string>
+
<string>443D289B0AA235320082552A</string>
+
<string>443D289E0AA235320082552A</string>
+
<string>443D28CF0AA235320082552A</string>
+
<string>443D28D50AA235320082552A</string>
+
<string>44CFE74B0AA2368E00E28EA8</string>
+
<string>44CFE74C0AA2368E00E28EA8</string>
</array>
</dict>
<key>SplitCount</key>
@@ -826,7 +466,7 @@
<key>Frame</key>
<string>{{0,
0}, {915, 688}}</string>
<key>RubberWindowFrame</key>
- <string>46 180
1208 848 0 0 1680 1028 </string>
+ <string>451 160
1208 848 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -846,7 +486,7 @@
<key>Frame</key>
<string>{{0,
693}, {915, 114}}</string>
<key>RubberWindowFrame</key>
- <string>46 180
1208 848 0 0 1680 1028 </string>
+ <string>451 160
1208 848 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -870,9 +510,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>44DA7B950A9A52080073B37F</string>
+ <string>44CFE74E0AA2368E00E28EA8</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>44DA7B960A9A52080073B37F</string>
+ <string>44CFE74F0AA2368E00E28EA8</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -1006,18 +646,13 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>44DA7CBD0A9B9DA40073B37F</string>
- <string>44DA7CBE0A9B9DA40073B37F</string>
- <string>4417DEC40A8E6D11000FE4DB</string>
- <string>44DA7CAF0A9B9D6B0073B37F</string>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>44DA7B9D0A9A52080073B37F</string>
- <string>4417DB580A8D2FCE000FE4DB</string>
+ <string>44CFE7560AA2368E00E28EA8</string>
<string>1C0AD2B3069F1EA900FABCE6</string>
+ <string>1CD10A99069EF8BA00B06720</string>
<string>/Users/halset/projects/CAYClient/CAYClient.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>46 180 1208 848 0 0 1680 1028 </string>
+ <string>451 160 1208 848 0 0 1680 1028 </string>
<key>WindowTools</key>
<array>
<dict>
@@ -1038,7 +673,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
-
<string>CAYObjectContext.m</string>
+
<string>CAYEntityResolver.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
@@ -1098,7 +733,7 @@
<key>TableOfContents</key>
<array>
<string>4417DB580A8D2FCE000FE4DB</string>
- <string>44DA7BBC0A9A53E60073B37F</string>
+ <string>443D284B0AA234190082552A</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -1140,8 +775,8 @@
<string>yes</string>
<key>sizes</key>
<array>
-
<string>{{0, 0}, {396, 267}}</string>
-
<string>{{396, 0}, {539, 267}}</string>
+
<string>{{0, 0}, {390, 267}}</string>
+
<string>{{390, 0}, {545, 267}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -1204,14 +839,14 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>44DA7B970A9A52080073B37F</string>
+ <string>44CFE7500AA2368E00E28EA8</string>
<string>1C162984064C10D400B95A72</string>
- <string>44DA7B980A9A52080073B37F</string>
- <string>44DA7B990A9A52080073B37F</string>
- <string>44DA7B9A0A9A52080073B37F</string>
- <string>44DA7B9B0A9A52080073B37F</string>
- <string>44DA7B9C0A9A52080073B37F</string>
- <string>44DA7B9D0A9A52080073B37F</string>
+ <string>44CFE7510AA2368E00E28EA8</string>
+ <string>44CFE7520AA2368E00E28EA8</string>
+ <string>44CFE7530AA2368E00E28EA8</string>
+ <string>44CFE7540AA2368E00E28EA8</string>
+ <string>44CFE7550AA2368E00E28EA8</string>
+ <string>44CFE7560AA2368E00E28EA8</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debug</string>
@@ -1220,7 +855,7 @@
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -1365,7 +1000,7 @@
<key>TableOfContents</key>
<array>
<string>4417DEC40A8E6D11000FE4DB</string>
- <string>44DA7CBC0A9B9DA40073B37F</string>
+ <string>443D29110AA235EC0082552A</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>WindowString</key>
@@ -1460,9 +1095,9 @@
<key>TableOfContents</key>
<array>
<string>1C0AD2B3069F1EA900FABCE6</string>
- <string>44DA7BBD0A9A53E60073B37F</string>
+ <string>44CFE7570AA2368E00E28EA8</string>
<string>1CD0528B0623707200166675</string>
- <string>44DA7BBE0A9A53E60073B37F</string>
+ <string>44CFE7580AA2368E00E28EA8</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.run</string>
