gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-23 14:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Recommit fix for class file exporting.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@11264 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-10-28 08:39:30 +00:00
parent d272114992
commit b7b2b3604a
2 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2001-10-26 Richard Frith-Macdonald <rfm@gnu.org>
* GormClassManager.m: Force class, action, and outlet names to be
legal identifiers ... ie consist of alhpanumeric and underscore
characters with a non-numeric initial character.
A roundabout/fundamental fix for a problem generating output files
reported by Ludovic Marcotte
2001-10-27 Laurent Julliard <laurent@julliard-online.org>
* ClassInformation.plist: IBInspector actions/outlets closer to OS 4.2

59
GormClassManager.m
View file

@ -764,7 +764,6 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
for (i = 0; i < n; i++)
{
actionName = [actions objectAtIndex: i];
actionName = [actionName substringToIndex: [actionName length] - 1];
[headerFile appendFormat: @"- (void) %@: (id)sender;\n", actionName];
[sourceFile appendFormat:
@"\n"
@ -804,6 +803,7 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
BOOL editActions;
}
- (NSString*) identifierString: (NSString*)str;
- (void) updateButtons;
- (void) renameClass: (id)sender;
- (void) changeSuperClass: (id)sender;
@ -953,7 +953,8 @@ selectCellWithString: (NSString*)title
superClassPU = [[NSPopUpButton alloc] initWithFrame: rect pullsDown: NO];
[superClassPU setTarget: self];
[superClassPU setAction: @selector(changeSuperClass:)];
[superClassPU setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
[superClassPU setAutoresizingMask:
NSViewWidthSizable|NSViewHeightSizable];
[superClassPU removeAllItems];
[superClassPU addItemWithTitle: @"superclass !"];
[contents addSubview: superClassPU];
@ -1049,7 +1050,7 @@ selectCellWithString: (NSString*)title
NSString *cn = [object className];
NSString *oldName = [[browser selectedCell] stringValue];
name = [editNameTF stringValue];
name = [self identifierString: [editNameTF stringValue]];
switch (editActions)
{ // Rename
@ -1100,7 +1101,7 @@ selectCellWithString: (NSString*)title
switch (editActions)
{ // Add
case 0: // outlets
name = [editNameTF stringValue];
name = [self identifierString: [editNameTF stringValue]];
NSLog(@"add outlet : %@", name);
if (name != nil && ![name isEqualToString: @""])
@ -1121,7 +1122,7 @@ selectCellWithString: (NSString*)title
break;
default: // actions
name = [editNameTF stringValue];
name = [self identifierString: [editNameTF stringValue]];
NSLog(@"add action : %@", name);
if (name != nil && ![name isEqualToString: @""])
@ -1195,6 +1196,7 @@ selectCellWithString: (NSString*)title
[self updateButtons];
}
}
- (void) renameClass: (id)sender
{
GormClassManager *cm = [(id)[(id)NSApp activeDocument] classManager];
@ -1203,7 +1205,7 @@ selectCellWithString: (NSString*)title
NSLog(@"rename class : Attention, the current implementation won't "
@"rename classes for objects already instantiated !");
newName = [classNameTF stringValue];
newName = [self identifierString: [classNameTF stringValue]];
if (newName != nil && [newName isEqualToString: @""] == NO)
{
if ([cm renameClassNamed: [object className] newName: newName])
@ -1221,6 +1223,51 @@ selectCellWithString: (NSString*)title
}
}
/*
* Produce identifier string byn removing illegal characters
* and leading numerics
*/
- (NSString*) identifierString: (NSString*)str
{
static NSCharacterSet *illegal = nil;
static NSCharacterSet *numeric = nil;
NSRange r;
NSMutableString *m;
if (illegal == nil)
{
illegal = [[NSCharacterSet characterSetWithCharactersInString:
@"_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"]
invertedSet];
numeric = [NSCharacterSet characterSetWithCharactersInString:
@"0123456789"];
RETAIN(illegal);
RETAIN(numeric);
}
if (str == nil)
{
return nil;
}
m = [str mutableCopy];
r = [str rangeOfCharacterFromSet: illegal];
while (r.length > 0)
{
[m deleteCharactersInRange: r];
r = [m rangeOfCharacterFromSet: illegal];
}
r = [str rangeOfCharacterFromSet: numeric];
while (r.length > 0 && r.location == 0)
{
[m deleteCharactersInRange: r];
r = [m rangeOfCharacterFromSet: numeric];
}
str = [m copy];
RELEASE(m);
AUTORELEASE(str);
return str;
}
- (void) updateButtons
{
GormClassManager *cm = [(id)[(id)NSApp activeDocument] classManager];