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

Corrected an issue with saving images/sounds

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@17267 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-07-20 20:26:20 +00:00
parent 432db07c5f
commit 049184d253
2 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2003-07-20 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: (-[GormDocument saveGormDocument:]) added
code to prevent copying of images/sounds if the source path
is the same as the destination. This was causing the file
to be truncated to zero and caused Gorm to lock.
* (-[GormDocument parseHeader:]): removed
extra characterset definition/
2003-07-14 Gregory John Casamento <greg_casamento@yahoo.com>
* GormClassManager.[hm]: Added implementation for new methods

43
GormDocument.m
View file

@ -183,7 +183,6 @@ static NSImage *classesImage = nil;
[connections addObject: aConnector];
[nc postNotificationName: IBDidAddConnectorNotification
object: aConnector];
}
}
@ -773,7 +772,6 @@ static NSImage *classesImage = nil;
NSScanner *headerScanner = [NSScanner scannerWithString: headerFile];
GormClassManager *cm = [self classManager];
NSCharacterSet *superClassStopSet = [NSCharacterSet characterSetWithCharactersInString: @" \n"];
NSCharacterSet *commentStopSet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];
NSCharacterSet *classStopSet = [NSCharacterSet characterSetWithCharactersInString: @" :"];
NSCharacterSet *categoryStopSet = [NSCharacterSet characterSetWithCharactersInString: @" ("];
NSCharacterSet *typeStopSet = [NSCharacterSet characterSetWithCharactersInString: @" "];
@ -784,6 +782,7 @@ static NSImage *classesImage = nil;
NSArray *outletTokens = [NSArray arrayWithObjects: @"id", @"IBOutlet", nil];
NSArray *actionTokens = [NSArray arrayWithObjects: @"(void)", @"(IBAction)", @"(id)", nil];
NSRange notFoundRange = NSMakeRange(NSNotFound,0);
// NSCharacterSet *commentStopSet = [NSCharacterSet characterSetWithCharactersInString: @"\n"];
while (![headerScanner isAtEnd])
{
@ -2782,12 +2781,13 @@ static NSImage *classesImage = nil;
// create the directory...
archiveResult = [mgr createDirectoryAtPath: documentPath attributes: nil];
}
RELEASE(archiver); // We're done with the archiver here..
if (archiveResult)
{
// save the data...
archiveResult = [archiverData writeToFile: gormPath atomically: YES];
RELEASE(archiver);
if (archiveResult)
{
// save the custom classes.. and we're done...
@ -2802,13 +2802,21 @@ static NSImage *classesImage = nil;
while ((object = [en nextObject]) != nil)
{
NSString *soundPath;
BOOL copied;
BOOL copied = NO;
soundPath = [documentPath stringByAppendingPathComponent:
[object lastPathComponent]];
copied = [mgr copyPath: object
toPath: soundPath
handler: nil];
if(![object isEqualToString: imagePath])
{
soundPath = [documentPath stringByAppendingPathComponent:
[object lastPathComponent]];
copied = [mgr copyPath: object
toPath: soundPath
handler: nil];
}
else
{
// mark as copied if paths are equal...
copied = YES;
}
if (!copied)
{
@ -2821,13 +2829,22 @@ static NSImage *classesImage = nil;
while ((object = [en nextObject]) != nil)
{
NSString *imagePath;
BOOL copied;
BOOL copied = NO;
imagePath = [documentPath stringByAppendingPathComponent:
[object lastPathComponent]];
copied = [mgr copyPath: object
toPath: imagePath
handler: nil];
if(![object isEqualToString: imagePath])
{
copied = [mgr copyPath: object
toPath: imagePath
handler: nil];
}
else
{
// mark it as copied if paths are equal.
copied = YES;
}
if (!copied)
{