Fix was preventing import of actions. Corrected.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@16996 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-06-22 06:08:16 +00:00
parent cb11fd65de
commit 2ce77f942c

View file

@ -778,7 +778,8 @@ static NSImage *classesImage = nil;
NSCharacterSet *typeStopSet = [NSCharacterSet characterSetWithCharactersInString: @" "];
NSCharacterSet *actionStopSet = [NSCharacterSet characterSetWithCharactersInString: @";:"];
NSCharacterSet *outletStopSet = [NSCharacterSet characterSetWithCharactersInString: @";,"];
NSCharacterSet *illegalSet = [NSCharacterSet characterSetWithCharactersInString: @"~`@#$%^&*()+={}|[]\\:;'<>?,./"];
NSCharacterSet *illegalOutletSet = [NSCharacterSet characterSetWithCharactersInString: @"~`@#$%^&*()+={}|[]\\:;'<>?,./"];
NSCharacterSet *illegalActionSet = [NSCharacterSet characterSetWithCharactersInString: @"~`@#$%^&*()+={}|[]\\;'<>?,./"];
NSArray *outletTokens = [NSArray arrayWithObjects: @"id", @"IBOutlet", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", @"(id)", nil];
NSRange notFoundRange = NSMakeRange(NSNotFound,0);
@ -872,7 +873,7 @@ static NSImage *classesImage = nil;
&& [outlets indexOfObject: outlet] == NSNotFound)
{
NSDebugLog(@"outlet = %@", outlet);
if(NSEqualRanges([outlet rangeOfCharacterFromSet: illegalSet],notFoundRange))
if(NSEqualRanges([outlet rangeOfCharacterFromSet: illegalOutletSet],notFoundRange))
{
[outlets addObject: outlet];
}
@ -918,7 +919,7 @@ static NSImage *classesImage = nil;
/* Add the ':' back */
action = [action stringByAppendingString: @":"];
NSDebugLog(@"action = %@", action);
if(NSEqualRanges([action rangeOfCharacterFromSet: illegalSet],notFoundRange))
if(NSEqualRanges([action rangeOfCharacterFromSet: illegalActionSet],notFoundRange))
{
[actions addObject: action];
}