gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-23 13:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes in EOControl/EOEditingContext.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@21182 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2005-05-03 09:42:53 +00:00
parent 2e0f2da446
commit dd40d225ec
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-05-03 Manuel Guesdon <mguesdon@orange-concept.com>
* EOControl/EOEditingContext.m:
o fixes in _mergeObject:withChanges:
(IMP initialization, variables (re-)initialization)
o added NSAssert in -_mutableSetFromToManyArray:
2005-04-24 Manuel Guesdon <mguesdon@orange-concept.com>
* EOAccess/EOAttribute.m:

22
EOControl/EOEditingContext.m
View file

@ -403,28 +403,31 @@ _mergeValueForKey(id obj, id value,
*/
- (void) _mergeObject: (id)obj withChanges: (NSArray *)changes
{
unsigned int i,n;
NSString *key;
NSArray *add, *del;
NSDictionary *change;
id val;
unsigned int n;
n = [changes count];
if (n>0)
{
IMP oaiIMP=[del methodForSelector: @selector(objectAtIndex:)];
IMP oaiIMP=[changes methodForSelector: @selector(objectAtIndex:)];
unsigned int i;
for(i = 0; i < n; i++)
{
change = GDL2_ObjectAtIndexWithImp(changes,oaiIMP,i);
key = [change objectForKey: EOConstKey];
val = [change objectForKey: EOConstValue];
NSArray *add = nil;
NSArray *del = nil;
NSDictionary* change = GDL2_ObjectAtIndexWithImp(changes,oaiIMP,i);
NSString* key = [change objectForKey: EOConstKey];
id val = [change objectForKey: EOConstValue];
if (val == nil)
{
add = [change objectForKey: EOConstAdd];
del = [change objectForKey: EOConstDel];
NSAssert(add!=nil && del!=nil,@"Invalid changes dictionary.");
}
_mergeValueForKey(obj, val, add, del, key);
}
};
@ -805,6 +808,7 @@ _mergeValueForKey(id obj, id value,
{
gid = GDL2_ObjectAtIndexWithImp(array, oaiIMP, i);
obj = NSMapGet(_objectsByGID, gid);
NSAssert1(obj,@"No object for gid %@", gid);
GDL2_AddObjectWithImp(set, aoIMP, obj);
}
};