Skip to content

Commit

Permalink
Improve the language of the API.
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeredpath committed Mar 21, 2010
1 parent 8eb9f19 commit 785b09b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Classes/CoreRemote/CRSyncManager.m
Expand Up @@ -117,7 +117,7 @@ - (void)remoteModel:(id)modelKlass didFetch:(NSArray *)results
CRManagedObject *managedObject = [managedObjectsByRemoteId objectForKey:remoteObject.remoteId];

if (managedObject != nil) {
[remoteObject syncManagedObjectToSelf:managedObject];
[remoteObject syncManagedObjectWithSelf:managedObject];
} else {
[remoteObject initializeInManagedObjectContext:self.managedObjectContext];
}
Expand All @@ -143,7 +143,7 @@ - (void)remoteModel:(id)modelKlass didCreate:(id<CRRemoteObject>)remoteObject;
// we now need to get the faulted object in the sync context; we can't use the
// managedObject from the remoteObject directly as it belongs to the main thread context.
CRManagedObject *managedObject = (CRManagedObject *)[self.managedObjectContext objectWithID:synchronizedObject.managedObjectID];
[synchronizedObject syncManagedObjectToSelf:managedObject];
[synchronizedObject syncManagedObjectWithSelf:managedObject];
[self.managedObjectContext save:nil];
}

Expand Down
4 changes: 2 additions & 2 deletions Classes/CoreRemote/CRSynchronizedObject.h
Expand Up @@ -49,12 +49,12 @@
* matching properties. The base implementation only syncs the remote ID
* property. Typically overridde by sub-classes to set their own unique properties.
*/
- (void)syncManagedObjectToSelf:(CRManagedObject *)object;
- (void)syncManagedObjectWithSelf:(CRManagedObject *)object;

/*
* Sets the object's properties to the values from the managed object.
*/
- (void)syncSelfToManagedObject:(CRManagedObject *)object;
- (void)syncSelfWithManagedObject:(CRManagedObject *)object;

/*
* The NSManagedObjectID for this object's local representation
Expand Down
10 changes: 5 additions & 5 deletions Classes/PTObject.m
Expand Up @@ -86,25 +86,25 @@ - (void)setManagedObject:(CRManagedObject *)object isMaster:(BOOL)isMaster;
self.managedObject = object;

if (isMaster) {
[self syncSelfToManagedObject:object];
[self syncSelfWithManagedObject:object];
} else {
[self syncManagedObjectToSelf:object];
[self syncManagedObjectWithSelf:object];
}
}

- (void)syncManagedObject;
{
if (self.managedObject) {
[self syncManagedObjectToSelf:self.managedObject];
[self syncManagedObjectWithSelf:self.managedObject];
}
}

- (void)syncManagedObjectToSelf:(CRManagedObject *)object;
- (void)syncManagedObjectWithSelf:(CRManagedObject *)object;
{
[object setValue:self.remoteId forKey:@"remoteId"];
}

- (void)syncSelfToManagedObject:(CRManagedObject *)object;
- (void)syncSelfWithManagedObject:(CRManagedObject *)object;
{
self.remoteId = [object valueForKey:@"remoteId"];
}
Expand Down
8 changes: 4 additions & 4 deletions Classes/PTProject.m
Expand Up @@ -49,17 +49,17 @@ - (NSString *)description;
return [NSString stringWithFormat:@"[PTProject id:%@ name:%@]", self.remoteId, self.name];
}

- (void)syncManagedObjectToSelf:(CRManagedObject *)object;
- (void)syncManagedObjectWithSelf:(CRManagedObject *)object;
{
[super syncManagedObjectToSelf:object];
[super syncManagedObjectWithSelf:object];

[object setValue:self.name forKey:@"name"];
[object setValue:self.account forKey:@"account"];
}

- (void)syncSelfToManagedObject:(CRManagedObject *)object;
- (void)syncSelfWithManagedObject:(CRManagedObject *)object;
{
[super syncSelfToManagedObject:object];
[super syncSelfWithManagedObject:object];

self.name = [object valueForKey:@"name"];
self.account = [object valueForKey:@"account"];
Expand Down

0 comments on commit 785b09b

Please sign in to comment.