Indentation tidyups - added { } in if, else, switch etc clauses

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11023 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2001-09-26 22:51:51 +00:00
parent a33ecb3697
commit 5079237988

View file

@ -237,10 +237,14 @@
- (void) setFilename: (NSString*)filename - (void) setFilename: (NSString*)filename
{ {
if (filename == nil || [filename isEqualToString: @""]) if (filename == nil || [filename isEqualToString: @""])
[NSException raise: NSInternalInconsistencyException {
format: @"Empty or nil argument to setFilename: "]; [NSException raise: NSInternalInconsistencyException
format: @"Empty or nil argument to setFilename: "];
}
else else
ASSIGN(_filename, filename); {
ASSIGN(_filename, filename);
}
} }
- (NSString*) filename - (NSString*) filename
@ -251,10 +255,14 @@
- (void) setPreferredFilename: (NSString*)filename - (void) setPreferredFilename: (NSString*)filename
{ {
if (filename == nil || [filename isEqualToString: @""]) if (filename == nil || [filename isEqualToString: @""])
[NSException raise: NSInternalInconsistencyException {
format: @"Empty or nil argument to setPreferredFilename: "]; [NSException raise: NSInternalInconsistencyException
format: @"Empty or nil argument to setPreferredFilename: "];
}
else else
ASSIGN(_preferredFilename, filename); {
ASSIGN(_preferredFilename, filename);
}
} }
- (NSString*) preferredFilename; - (NSString*) preferredFilename;
@ -265,8 +273,10 @@
- (void) setFileAttributes: (NSDictionary*)attributes - (void) setFileAttributes: (NSDictionary*)attributes
{ {
if (_fileAttributes == nil) if (_fileAttributes == nil)
_fileAttributes = [NSMutableDictionary new]; {
_fileAttributes = [NSMutableDictionary new];
}
[_fileAttributes addEntriesFromDictionary: attributes]; [_fileAttributes addEntriesFromDictionary: attributes];
} }
@ -278,25 +288,37 @@
- (BOOL) isRegularFile - (BOOL) isRegularFile
{ {
if (_wrapperType == GSFileWrapperRegularFileType) if (_wrapperType == GSFileWrapperRegularFileType)
return YES; {
return YES;
}
else else
return NO; {
return NO;
}
} }
- (BOOL) isDirectory - (BOOL) isDirectory
{ {
if (_wrapperType == GSFileWrapperDirectoryType) if (_wrapperType == GSFileWrapperDirectoryType)
return YES; {
return YES;
}
else else
return NO; {
return NO;
}
} }
- (BOOL) isSymbolicLink - (BOOL) isSymbolicLink
{ {
if (_wrapperType == GSFileWrapperSymbolicLinkType) if (_wrapperType == GSFileWrapperSymbolicLinkType)
return YES; {
return YES;
}
else else
return NO; {
return NO;
}
} }
- (void) setIcon: (NSImage*)icon - (void) setIcon: (NSImage*)icon
@ -307,9 +329,13 @@
- (NSImage*) icon; - (NSImage*) icon;
{ {
if (_iconImage == nil) if (_iconImage == nil)
return [[NSWorkspace sharedWorkspace] iconForFile: [self filename]]; {
return [[NSWorkspace sharedWorkspace] iconForFile: [self filename]];
}
else else
return _iconImage; {
return _iconImage;
}
} }
- (BOOL) needsToBeUpdatedFromPath: (NSString*)path - (BOOL) needsToBeUpdatedFromPath: (NSString*)path
@ -451,9 +477,13 @@
wrapper = AUTORELEASE([[NSFileWrapper alloc] initWithPath: path]); wrapper = AUTORELEASE([[NSFileWrapper alloc] initWithPath: path]);
if (wrapper != nil) if (wrapper != nil)
return [self addFileWrapper: wrapper]; {
return [self addFileWrapper: wrapper];
}
else else
return nil; {
return nil;
}
} }
- (NSString*) addRegularFileWithContents: (NSData*)data - (NSString*) addRegularFileWithContents: (NSData*)data
@ -470,7 +500,9 @@
return [self addFileWrapper: wrapper]; return [self addFileWrapper: wrapper];
} }
else else
return nil; {
return nil;
}
} }
- (NSString*) addSymbolicLinkWithDestination: (NSString*)path - (NSString*) addSymbolicLinkWithDestination: (NSString*)path
@ -487,7 +519,9 @@
return [self addFileWrapper: wrapper]; return [self addFileWrapper: wrapper];
} }
else else
return nil; {
return nil;
}
} }
// //
@ -497,11 +531,15 @@
- (NSData*) regularFileContents - (NSData*) regularFileContents
{ {
if (_wrapperType == GSFileWrapperRegularFileType) if (_wrapperType == GSFileWrapperRegularFileType)
return _wrapperData; {
return _wrapperData;
}
else else
[NSException raise: NSInternalInconsistencyException {
format: @"File wrapper does not wrap regular file."]; [NSException raise: NSInternalInconsistencyException
format: @"File wrapper does not wrap regular file."];
}
return nil; return nil;
} }
@ -512,11 +550,15 @@
- (NSString*) symbolicLinkDestination - (NSString*) symbolicLinkDestination
{ {
if (_wrapperType == GSFileWrapperSymbolicLinkType) if (_wrapperType == GSFileWrapperSymbolicLinkType)
return _wrapperData; {
return _wrapperData;
}
else else
[NSException raise: NSInternalInconsistencyException {
format: @"File wrapper does not wrap symbolic link."]; [NSException raise: NSInternalInconsistencyException
format: @"File wrapper does not wrap symbolic link."];
}
return nil; return nil;
} }
@ -551,17 +593,23 @@
switch (wrapperType) switch (wrapperType)
{ {
case GSFileWrapperRegularFileType: case GSFileWrapperRegularFileType:
{
self = [self initRegularFileWithContents: wrapperData]; self = [self initRegularFileWithContents: wrapperData];
break; break;
case GSFileWrapperSymbolicLinkType: }
case GSFileWrapperSymbolicLinkType:
{
self = [self initSymbolicLinkWithDestination: wrapperData]; self = [self initSymbolicLinkWithDestination: wrapperData];
break; break;
case GSFileWrapperDirectoryType: }
case GSFileWrapperDirectoryType:
{
self = [self initDirectoryWithFileWrappers: wrapperData]; self = [self initDirectoryWithFileWrappers: wrapperData];
break; break;
}
} }
if (preferredFilename != nil) if (preferredFilename != nil)
{ {
[self setPreferredFilename: preferredFilename]; [self setPreferredFilename: preferredFilename];