gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 12:55:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EOModel.m

Browse source 
-addEntity:
change error checks to be in sync with reference 



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30897 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-06-29 22:28:51 +00:00
parent e954a305bd
commit c00b1ebc37
2 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-29 David Wetzel <dave@turbocat.de>
* EOAccess/EOModel.m
-addEntity:
change error checks to be in sync with reference
2010-06-29 David Wetzel <dave@turbocat.de>
* EOControl/EOFault.h
* EOControl/EOFaultHandler.m

49
EOAccess/EOModel.m
View file

@ -1534,37 +1534,52 @@ NSString *EOEntityLoadedNotification = @"EOEntityLoadedNotification";
- (void) addEntity: (EOEntity *)entity
{
NSString *entityName = [entity name];
// void *entitiesClass;
// int count;
// void *entitiesClass;
// int count;
NSString *className = nil;
NSAssert1([self entityNamed: [entity name]] == nil,
@"Entity '%@' is already registered with this model",
entityName);
NSAssert2([entity model]==nil,
@"Entity '%@' is already owned by model '%@'.",
[entity name], [[entity model] name]);
if (!entity)
{
[NSException raise: NSInvalidArgumentException
format: @"%s entity is nil.", __PRETTY_FUNCTION__];
}
if (([entity model] != nil) && ([entity model] != self))
{
[NSException raise: NSInvalidArgumentException
format: @"%s %@ already registered with model named '%@'",
__PRETTY_FUNCTION__,
entityName, [[entity model] name]];
}
if ([_entitiesByName objectForKey:[entity name]])
{
[NSException raise: NSInvalidArgumentException
format: @"%s Cannot register two entities with the same name",
__PRETTY_FUNCTION__];
}
[self willChange];
/* _entities is sorted. we want a new one! */
if (_entities) {
DESTROY(_entities);
}
NSAssert(_entitiesByClass, @"No _entitiesByClass");
className = [entity className];
NSAssert1(className, @"No className in %@", entity);
if (NSMapGet(_entitiesByClass, className))
NSMapRemove(_entitiesByClass, className);
NSMapInsertIfAbsent(_entitiesByClass, className, entity);
[_entitiesByName setObject: entity
forKey: entityName];
forKey: entityName];
[entity _setModel: self];
}