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

Applied patch suggested by Enrico Sersale

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@15355 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2002-12-27 20:20:32 +00:00
parent e7395bc91f
commit e2166db8d3
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-12-27 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: -[GormDocument parseHeader:] corrected problem
pointed out be Enrico Sersale. Applied patch. Thanks!
2002-12-21 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: Added code in loadDocument: to create an empty

19
GormDocument.m
View file

@ -721,13 +721,15 @@ static NSImage *classesImage = nil;
NSString *headerFile = [NSString stringWithContentsOfFile: headerPath];
NSScanner *headerScanner = [NSScanner scannerWithString: headerFile];
GormClassManager *cm = [self classManager];
NSCharacterSet *terminatorSet = [NSCharacterSet characterSetWithCharactersInString: @" \n"];
NSCharacterSet *stopSet = [NSCharacterSet characterSetWithCharactersInString: @" :"];
NSArray *outletTokens = [NSArray arrayWithObjects: @"id", @"IBOutlet id", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", nil];
while(![headerScanner isAtEnd])
{
NSString *classString = nil;
BOOL classfound = NO, result = NO;
NSArray *outletTokens = [NSArray arrayWithObjects: @"id", @"IBOutlet id", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", nil];
NSEnumerator *outletEnum = [outletTokens objectEnumerator];
NSEnumerator *actionEnum = [actionTokens objectEnumerator];
NSString *outletToken = nil;
@ -750,7 +752,6 @@ static NSImage *classesImage = nil;
*classScanner = [NSScanner scannerWithString: classString],
*ivarScanner = nil,
*methodScanner = nil;
NSCharacterSet *stopSet = [NSCharacterSet characterSetWithCharactersInString: @" :"];
NSMutableArray
*actions = [NSMutableArray array],
*outlets = [NSMutableArray array];
@ -761,7 +762,7 @@ static NSImage *classesImage = nil;
intoString: &className];
[classScanner scanString: @":"
intoString: NULL];
[classScanner scanUpToString: @"\n"
[classScanner scanUpToCharactersFromSet: terminatorSet
intoString: &superClassName];
[classScanner scanUpToString: @"{"
intoString: NULL];
@ -859,7 +860,15 @@ static NSImage *classesImage = nil;
}
else
{
NSLog(@"Class %@ failed to add", className);
NSString *message = [NSString stringWithFormat:
@"The class %@ could not be added",
className];
NSRunAlertPanel(@"Problem adding class from header",
message,
nil,
nil,
nil);
NSDebugLog(@"Class %@ failed to add", className);
}
} // if we found a class
}