* EOInterface/EODisplayGroup.m (-deleteObjectAtIndex:):

* EOModeler/EOModelerDocument.m (-adaptor, -saveToPath:):
	Return with NS_VALUERETURN from within exception handling block.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@25123 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2007-05-05 10:34:42 +00:00
parent 9be4405f6a
commit fb1d4774d5
3 changed files with 9 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2007-05-05 Matt Rice <ratmice@gmail.com>
* EOInterface/EODisplayGroup.m (-deleteObjectAtIndex:):
* EOModeler/EOModelerDocument.m (-adaptor, -saveToPath:):
Return with NS_VALUERETURN from within exception handling block.
2007-05-02 David Ayers <ayers@fsfe.org> 2007-05-02 David Ayers <ayers@fsfe.org>
* EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile, * EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile,

View file

@ -1001,7 +1001,7 @@ static BOOL _globalDefaultForValidatesChangesImmediately = NO;
} }
[_displayedObjects removeObjectAtIndex:index]; [_displayedObjects removeObjectAtIndex:index];
[_allObjects removeObject:object]; [_allObjects removeObject:object];
return YES; NS_VALUERETURN(YES, BOOL);
NS_HANDLER NS_HANDLER
return NO; return NO;
NS_ENDHANDLER NS_ENDHANDLER

View file

@ -176,7 +176,7 @@ NSString *EOMConsistencyModelObjectKey = @"EOMConsistencyModelObjectKey";
- (EOAdaptor *)adaptor - (EOAdaptor *)adaptor
{ {
NS_DURING NS_DURING
return [EOAdaptor adaptorWithModel:_model]; NS_VALUERETURN([EOAdaptor adaptorWithModel:_model], EOAdaptor *);
NS_HANDLER NS_HANDLER
return nil; return nil;
NS_ENDHANDLER NS_ENDHANDLER
@ -230,12 +230,11 @@ NSString *EOMConsistencyModelObjectKey = @"EOMConsistencyModelObjectKey";
- (BOOL)saveToPath:(NSString *)path - (BOOL)saveToPath:(NSString *)path
{ {
NSString *ext = [path pathExtension]; NSString *ext = [path pathExtension];
if (!([ext isEqual:@"eomodeld"] || [ext isEqual:@"eomodel"])) if (!([ext isEqual:@"eomodeld"] || [ext isEqual:@"eomodel"]))
path = [path stringByAppendingPathExtension:@"eomodeld"]; path = [path stringByAppendingPathExtension:@"eomodeld"];
NS_DURING NS_DURING
[_model writeToFile: path]; [_model writeToFile: path];
return YES; NS_VALUERETURN(YES, BOOL);
NS_HANDLER NS_HANDLER
NSRunAlertPanel(@"Error", NSRunAlertPanel(@"Error",
@"Save failed: %@", @"Save failed: %@",