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

Improved handling of problems with data.classes file.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@20312 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2004-11-08 04:08:36 +00:00
parent 841aae30f5
commit 85f23ac47e
2 changed files with 47 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-11-07 22:56 Gregory John Casamento <greg_casamento@yahoo.com>
* GormClassManager.m: Added code to [GormClassManager
loadCustomClasses:] to ignore any entry in the data.classes file
which is not a dictionary.
2004-11-07 22:56 Gregory John Casamento <greg_casamento@yahoo.com>
* GormClassManager.m: Added code to [GormClassManager saveToFile:]

75
GormClassManager.m
View file

@ -1287,51 +1287,58 @@
return NO;
}
// iterate over the set of classes, if it's in the classInformation
// Iterate over the set of classes, if it's in the classInformation
// list, it's a category, if it's not it's a custom class.
[dict removeObjectForKey: @"##Comment"]; // remove the comment...
en = [dict keyEnumerator];
while((key = [en nextObject]) != nil)
{
NSMutableDictionary *class_dict = [dict objectForKey: key];
NSMutableDictionary *info = [classInformation objectForKey: key];
if(info == nil)
{
[customClasses addObject: key];
[classInformation setObject: class_dict forKey: key];
}
else
{
NSMutableArray *actions = [class_dict objectForKey: @"Actions"];
NSMutableArray *orig_actions = [info objectForKey: @"Actions"];
NSMutableArray *all_actions = nil;
id class_dict = [dict objectForKey: key];
// remove any duplicate actions...
if(orig_actions != nil)
// Class information is always a dictionary, other information, such as
// comments or version numbers, will appear as strings.
if([class_dict isKindOfClass: [NSDictionary class]])
{
NSMutableDictionary *classDict = (NSMutableDictionary *)class_dict;
NSMutableDictionary *info = [classInformation objectForKey: key];
if(info == nil)
{
NSEnumerator *en = [actions objectEnumerator];
id action = nil;
all_actions = [NSMutableArray arrayWithArray: orig_actions];
[all_actions addObjectsFromArray: actions];
[info setObject: all_actions forKey: @"AllActions"];
// take out any duplicates which might be present.
while((action = [en nextObject]) != nil)
[customClasses addObject: key];
[classInformation setObject: classDict forKey: key];
}
else
{
NSMutableArray *actions = [classDict objectForKey: @"Actions"];
NSMutableArray *orig_actions = [info objectForKey: @"Actions"];
NSMutableArray *all_actions = nil;
// remove any duplicate actions...
if(orig_actions != nil)
{
if([orig_actions containsObject: action])
NSEnumerator *en = [actions objectEnumerator];
id action = nil;
all_actions = [NSMutableArray arrayWithArray: orig_actions];
[all_actions addObjectsFromArray: actions];
[info setObject: all_actions forKey: @"AllActions"];
// take out any duplicates which might be present.
while((action = [en nextObject]) != nil)
{
[actions removeObject: action];
if([orig_actions containsObject: action])
{
[actions removeObject: action];
}
}
}
}
// if there are any action methods left after the process above,
// add it, otherwise don't.
if([actions count] > 0)
{
[categoryClasses addObject: key];
[info setObject: actions forKey: @"ExtraActions"];
// if there are any action methods left after the process above,
// add it, otherwise don't.
if([actions count] > 0)
{
[categoryClasses addObject: key];
[info setObject: actions forKey: @"ExtraActions"];
}
}
}
}