* EOControl/EOObjectStore.m: Assign correct key names for EOUpdatedKey,

EOInsertedKey, EODeletedKey, EOInvalidatedKey.
        * EOAccess/EODatabaseContext.m (-_objectsChanged:, -commitChanges): Use
        EOUpdatedKey, EOInsertedKey, EODeletedKey, EOInvalidatedKey, instead
        of hard coded keys.
        * EOControl/EOEditingContext.m (-didSaveChanges, pendingInfo): Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20674 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2005-02-08 14:02:32 +00:00
parent cc0706bf5c
commit 8eff5c7764
4 changed files with 25 additions and 16 deletions

View file

@ -1,3 +1,12 @@
2005-02-07 Matt Rice <ratmice@yahoo.com>
* EOControl/EOObjectStore.m: Assign correct key names for EOUpdatedKey,
EOInsertedKey, EODeletedKey, EOInvalidatedKey.
* EOAccess/EODatabaseContext.m (-_objectsChanged:, -commitChanges): Use
EOUpdatedKey, EOInsertedKey, EODeletedKey, EOInvalidatedKey, instead
of hard coded keys.
* EOControl/EOEditingContext.m (-didSaveChanges, pendingInfo): Ditto.
2005-02-03 David Ayers <d.ayers@inode.at>
* EOAccess/EODatabaseContext.h/m:(_numLocked): Removed.

View file

@ -889,9 +889,9 @@ userInfo = {
//OK for update
//TODO-NOW for insert/delete
NSDictionary *userInfo = [notification userInfo];
NSArray *updatedObjects = [userInfo objectForKey: @"updated"];
//NSArray *insertedObjects = [userInfo objectForKey: @"inserted"];
//NSArray *deletedObjects = [userInfo objectForKey: @"deleted"];
NSArray *updatedObjects = [userInfo objectForKey: EOUpdatedKey];
//NSArray *insertedObjects = [userInfo objectForKey: EOInsertedKey];
//NSArray *deletedObjects = [userInfo objectForKey: EODeletedKey];
int i, count = [updatedObjects count];
NSDebugMLLog(@"EODatabaseContext", @"updatedObjects=%@", updatedObjects);
@ -3490,9 +3490,9 @@ Raises an exception is the adaptor is unable to perform the operations.
postNotificationName: @"EOObjectsChangedInStoreNotification"
object: _database
userInfo: [NSDictionary dictionaryWithObjectsAndKeys:
deletedObjects, @"deleted",
insertedObjects, @"inserted",
updatedObjects, @"updated",
deletedObjects, EODeletedKey,
insertedObjects, EOInsertedKey,
updatedObjects, EOUpdatedKey,
nil, nil]]; //call self _snapshotsChangedInDatabase:
}

View file

@ -2321,9 +2321,9 @@ _mergeValueForKey(id obj, id value,
postNotificationName: @"EOEditingContextDidSaveChangesNotification"
object: self
userInfo: [NSDictionary dictionaryWithObjectsAndKeys:
objectsForNotification[0], @"inserted",
objectsForNotification[1], @"deleted",
objectsForNotification[2], @"updated",
objectsForNotification[0], EOInsertedKey,
objectsForNotification[1], EODeletedKey,
objectsForNotification[2], EOUpdatedKey,
nil, nil]];
EOFLOGObjectFnStop();
@ -3554,9 +3554,9 @@ shouldContinueFetchingWithCurrentObjectCount: (unsigned)count
}
infoDict = [NSDictionary dictionaryWithObjectsAndKeys:
objectsForInfo[0], @"inserted",
objectsForInfo[1], @"deleted",
objectsForInfo[2], @"updated",
objectsForInfo[0], EOInsertedKey,
objectsForInfo[1], EODeletedKey,
objectsForInfo[2], EOUpdatedKey,
nil, nil];
NSDebugMLog(@"infoDict=%@", infoDict);

View file

@ -53,10 +53,10 @@ NSString *EOObjectsChangedInStoreNotification = @"EOObjectsChangedInStoreNotific
NSString *EOInvalidatedAllObjectsInStoreNotification = @"EOInvalidatedAllObjectsInStoreNotification";
NSString *EODeletedKey = @"inserted";
NSString *EOInsertedKey = @"deleted";
NSString *EOInvalidatedKey = @"updated";
NSString *EOUpdatedKey = @"invalidated";
NSString *EODeletedKey = @"deleted";
NSString *EOInsertedKey = @"inserted";
NSString *EOInvalidatedKey = @"invalidated";
NSString *EOUpdatedKey = @"updated";
@implementation EOObjectStore