Reindented to conform to standards

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10289 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2001-07-04 17:20:49 +00:00
parent eeefe3d6ed
commit dd921c06dc

View file

@ -48,17 +48,19 @@ static NSString *NSDocumentClassKey = @"NSDocumentClass";
#define TYPE_INFO(name) TypeInfoForName(_types, name) #define TYPE_INFO(name) TypeInfoForName(_types, name)
static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName) static NSDictionary *TypeInfoForName (NSArray *types, NSString *typeName)
{ {
int i, count = [types count]; int i, count = [types count];
for (i=0; i<count;i++) for (i = 0; i < count; i++)
{ {
NSDictionary *dict = [types objectAtIndex:i]; NSDictionary *dict = [types objectAtIndex: i];
if ([[dict objectForKey: NSNameKey] isEqualToString: typeName])
{
return dict;
}
}
if ([[dict objectForKey:NSNameKey] isEqualToString:typeName])
return dict;
}
return nil; return nil;
} }
@ -68,22 +70,24 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
{ {
} }
+ (id)documentController //private + (id) documentController //private
{ {
return [self sharedDocumentController]; return [self sharedDocumentController];
} }
+ (id)allocWithZone:(NSZone *)zone + (id) allocWithZone: (NSZone *)zone
{ {
return [self sharedDocumentController]; return [self sharedDocumentController];
} }
+ (id)sharedDocumentController + (id) sharedDocumentController
{ {
static id instance = nil; static id instance = nil;
if (instance == nil) if (instance == nil)
instance = [[super allocWithZone:NULL] init]; {
instance = [[super allocWithZone:NULL] init];
}
return instance; return instance;
} }
@ -92,107 +96,122 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
{ {
NSDictionary *customDict = [[NSBundle mainBundle] infoDictionary]; NSDictionary *customDict = [[NSBundle mainBundle] infoDictionary];
ASSIGN(_types, [customDict objectForKey:NSTypesKey]); ASSIGN (_types, [customDict objectForKey: NSTypesKey]);
_documents = [[NSMutableArray alloc] init]; _documents = [[NSMutableArray alloc] init];
// FIXME: Should fill this list form some stored values // FIXME: Should fill this list form some stored values
_recentDocuments = [[NSMutableArray alloc] init]; _recentDocuments = [[NSMutableArray alloc] init];
[self setShouldCreateUI:YES]; [self setShouldCreateUI:YES];
[[[NSWorkspace sharedWorkspace] notificationCenter] [[[NSWorkspace sharedWorkspace] notificationCenter]
addObserver:self addObserver: self
selector:@selector(_workspaceWillPowerOff:) selector: @selector(_workspaceWillPowerOff:)
name:NSWorkspaceWillPowerOffNotification name: NSWorkspaceWillPowerOffNotification
object:nil]; object: nil];
return self; return self;
} }
- (void)dealloc - (void) dealloc
{ {
[[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver: self];
RELEASE(_documents); RELEASE (_documents);
RELEASE(_recentDocuments); RELEASE (_recentDocuments);
RELEASE(_types); RELEASE (_types);
[super dealloc]; [super dealloc];
} }
- (BOOL)shouldCreateUI - (BOOL) shouldCreateUI
{ {
return _controllerFlags.shouldCreateUI; return _controllerFlags.shouldCreateUI;
} }
- (void)setShouldCreateUI:(BOOL)flag - (void) setShouldCreateUI: (BOOL)flag
{ {
_controllerFlags.shouldCreateUI = flag; _controllerFlags.shouldCreateUI = flag;
} }
- (id)makeUntitledDocumentOfType:(NSString *)type - (id) makeUntitledDocumentOfType: (NSString *)type
{ {
Class documentClass = [self documentClassForType:type]; Class documentClass = [self documentClassForType: type];
return AUTORELEASE([[documentClass alloc] init]); return AUTORELEASE ([[documentClass alloc] init]);
} }
- (id)makeDocumentWithContentsOfFile:(NSString *)fileName ofType:(NSString *)type - (id) makeDocumentWithContentsOfFile: (NSString *)fileName
ofType: (NSString *)type
{ {
Class documentClass = [self documentClassForType:type]; Class documentClass = [self documentClassForType:type];
return AUTORELEASE([[documentClass alloc] initWithContentsOfFile:fileName ofType:type]); return AUTORELEASE ([[documentClass alloc] initWithContentsOfFile: fileName
ofType: type]);
} }
- (id)makeDocumentWithContentsOfURL:(NSURL *)url ofType:(NSString *)type - (id) makeDocumentWithContentsOfURL: (NSURL *)url ofType: (NSString *)type
{ {
Class documentClass = [self documentClassForType:type]; Class documentClass = [self documentClassForType: type];
return AUTORELEASE([[documentClass alloc] initWithContentsOfURL:url ofType:type]); return AUTORELEASE ([[documentClass alloc] initWithContentsOfURL: url
ofType: type]);
} }
- _defaultType - _defaultType
{ {
if ([_types count] == 0) if ([_types count] == 0)
return nil; // raise exception? {
return nil; // raise exception?
}
return [[_types objectAtIndex:0] objectForKey:NSNameKey]; return [[_types objectAtIndex:0] objectForKey:NSNameKey];
} }
- (void)addDocument:(NSDocument *)document - (void) addDocument: (NSDocument *)document
{ {
[_documents addObject:document]; [_documents addObject: document];
} }
- (void)removeDocument:(NSDocument *)document - (void) removeDocument: (NSDocument *)document
{ {
[_documents removeObject:document]; [_documents removeObject: document];
} }
- (id)openUntitledDocumentOfType:(NSString*)type display:(BOOL)display - (id) openUntitledDocumentOfType: (NSString*)type display: (BOOL)display
{ {
NSDocument *document = [self makeUntitledDocumentOfType:type]; NSDocument *document = [self makeUntitledDocumentOfType: type];
if (document == nil) if (document == nil)
return nil; {
return nil;
}
[self addDocument:document]; [self addDocument: document];
if ([self shouldCreateUI]) if ([self shouldCreateUI])
{ {
[document makeWindowControllers]; [document makeWindowControllers];
if (display) if (display)
[document showWindows]; {
[document showWindows];
}
} }
return document; return document;
} }
- (id)openDocumentWithContentsOfFile:(NSString *)fileName display:(BOOL)display - (id) openDocumentWithContentsOfFile: (NSString *)fileName
display: (BOOL)display
{ {
NSDocument *document = [self documentForFileName:fileName]; NSDocument *document = [self documentForFileName: fileName];
if (document == nil) if (document == nil)
{ {
NSString *type = [self typeFromFileExtension:[fileName pathExtension]]; NSString *type = [self typeFromFileExtension: [fileName pathExtension]];
if ((document = [self makeDocumentWithContentsOfFile:fileName ofType:type])) if ((document = [self makeDocumentWithContentsOfFile: fileName
[self addDocument:document]; ofType: type]))
{
[self addDocument: document];
}
if ([self shouldCreateUI]) if ([self shouldCreateUI])
[document makeWindowControllers]; {
[document makeWindowControllers];
}
} }
if (display && [self shouldCreateUI]) if (display && [self shouldCreateUI])
@ -203,24 +222,27 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
return document; return document;
} }
- (id)openDocumentWithContentsOfURL:(NSURL *)url display:(BOOL)display - (id) openDocumentWithContentsOfURL: (NSURL *)url display: (BOOL)display
{ {
// Should we only do this if [url isFileURL] is YES? // Should we only do this if [url isFileURL] is YES?
NSDocument *document = [self documentForFileName:[url path]]; NSDocument *document = [self documentForFileName: [url path]];
// remember this document as opened // remember this document as opened
[self noteNewRecentDocumentURL: url]; [self noteNewRecentDocumentURL: url];
if (document == nil) if (document == nil)
{ {
NSString *type = [self typeFromFileExtension:[[url path] pathExtension]]; NSString *type = [self typeFromFileExtension:
[[url path] pathExtension]];
document = [self makeDocumentWithContentsOfURL: url ofType: type];
document = [self makeDocumentWithContentsOfURL:url ofType:type];
if (document == nil) if (document == nil)
return nil; {
return nil;
}
[self addDocument:document]; [self addDocument: document];
if ([self shouldCreateUI]) if ([self shouldCreateUI])
{ {
@ -236,40 +258,41 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
return document; return document;
} }
- _setupOpenPanel - (NSOpenPanel *) _setupOpenPanel
{ {
NSOpenPanel *openPanel = [NSOpenPanel openPanel]; NSOpenPanel *openPanel = [NSOpenPanel openPanel];
[openPanel setDirectory:[self currentDirectory]]; [openPanel setDirectory: [self currentDirectory]];
[openPanel setAllowsMultipleSelection:YES]; [openPanel setAllowsMultipleSelection: YES];
return openPanel; return openPanel;
} }
- (int)runModalOpenPanel:(NSOpenPanel *)openPanel forTypes:(NSArray *)openableFileExtensions - (int) runModalOpenPanel: (NSOpenPanel *)openPanel
forTypes: (NSArray *)openableFileExtensions
{ {
return [openPanel runModalForTypes:openableFileExtensions]; return [openPanel runModalForTypes:openableFileExtensions];
} }
- (NSArray *)_openableFileExtensions - (NSArray *) _openableFileExtensions
{ {
int i, count = [_types count]; int i, count = [_types count];
NSMutableArray *array = [NSMutableArray arrayWithCapacity:count]; NSMutableArray *array = [NSMutableArray arrayWithCapacity: count];
for (i=0; i<count; i++) for (i = 0; i < count; i++)
{ {
NSDictionary *typeInfo = [_types objectAtIndex:i]; NSDictionary *typeInfo = [_types objectAtIndex: i];
[array addObjectsFromArray:[typeInfo objectForKey:NSUnixExtensionsKey]]; [array addObjectsFromArray: [typeInfo objectForKey: NSUnixExtensionsKey]];
[array addObjectsFromArray:[typeInfo objectForKey:NSDOSExtensionsKey]]; [array addObjectsFromArray: [typeInfo objectForKey: NSDOSExtensionsKey]];
} }
return array; return array;
} }
- (NSArray *)fileNamesFromRunningOpenPanel - (NSArray *) fileNamesFromRunningOpenPanel
{ {
NSArray *types = [self _openableFileExtensions]; NSArray *types = [self _openableFileExtensions];
NSOpenPanel *openPanel = [self _setupOpenPanel]; NSOpenPanel *openPanel = [self _setupOpenPanel];
if ([self runModalOpenPanel:openPanel forTypes:types]) if ([self runModalOpenPanel: openPanel forTypes: types])
{ {
return [openPanel filenames]; return [openPanel filenames];
} }
@ -277,12 +300,12 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
return nil; return nil;
} }
- (NSArray *)URLsFromRunningOpenPanel - (NSArray *) URLsFromRunningOpenPanel
{ {
NSArray *types = [self _openableFileExtensions]; NSArray *types = [self _openableFileExtensions];
NSOpenPanel *openPanel = [self _setupOpenPanel]; NSOpenPanel *openPanel = [self _setupOpenPanel];
if ([self runModalOpenPanel:openPanel forTypes:types]) if ([self runModalOpenPanel: openPanel forTypes: types])
{ {
return [openPanel URLs]; return [openPanel URLs];
} }
@ -291,7 +314,7 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
} }
- (IBAction)saveAllDocuments:(id)sender - (IBAction) saveAllDocuments: (id)sender
{ {
NSDocument *document; NSDocument *document;
NSEnumerator *docEnum = [_documents objectEnumerator]; NSEnumerator *docEnum = [_documents objectEnumerator];
@ -300,55 +323,64 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
{ {
if ([document isDocumentEdited]) //maybe we should save regardless... if ([document isDocumentEdited]) //maybe we should save regardless...
{ {
[document saveDocument:sender]; [document saveDocument: sender];
} }
} }
} }
- (IBAction)openDocument:(id)sender - (IBAction) openDocument: (id)sender
{ {
NSEnumerator *fileEnum = [[self fileNamesFromRunningOpenPanel] objectEnumerator]; NSEnumerator *fileEnum;
NSString *filename; NSString *filename;
fileEnum = [[self fileNamesFromRunningOpenPanel] objectEnumerator];
while ((filename = [fileEnum nextObject])) while ((filename = [fileEnum nextObject]))
{ {
[self openDocumentWithContentsOfFile:filename display:YES]; [self openDocumentWithContentsOfFile: filename display: YES];
} }
} }
- (IBAction)newDocument:(id)sender - (IBAction) newDocument: (id)sender
{ {
[self openUntitledDocumentOfType:[self _defaultType] display:YES]; [self openUntitledDocumentOfType: [self _defaultType] display: YES];
} }
- (BOOL)closeAllDocuments - (BOOL) closeAllDocuments
{ {
NSDocument *document; NSDocument *document;
NSEnumerator *docEnum = [_documents objectEnumerator]; NSEnumerator *docEnum = [_documents objectEnumerator];
while ((document = [docEnum nextObject])) while ((document = [docEnum nextObject]))
{ {
if (![document canCloseDocument]) return NO; if (![document canCloseDocument])
{
return NO;
}
[document close]; [document close];
[self removeDocument:document]; [self removeDocument: document];
} }
return YES; return YES;
} }
- (BOOL)reviewUnsavedDocumentsWithAlertTitle:(NSString *)title cancellable:(BOOL)cancellable - (BOOL) reviewUnsavedDocumentsWithAlertTitle: (NSString *)title
cancellable: (BOOL)cancellable
{ {
//FIXME -- localize. //FIXME -- localize.
NSString *cancelString = (cancellable)? @"Cancel" : nil; NSString *cancelString = (cancellable)? @"Cancel" : nil;
int result; int result;
if (![self hasEditedDocuments]) return YES; if (![self hasEditedDocuments])
{
return YES;
}
result = NSRunAlertPanel(title, @"You have unsaved documents.", result = NSRunAlertPanel(title, @"You have unsaved documents.",
@"Review Unsaved", cancelString, @"Quit Anyways"); @"Review Unsaved", cancelString, @"Quit Anyways");
#define ReviewUnsaved NSAlertDefaultReturn #define ReviewUnsaved NSAlertDefaultReturn
#define Cancel NSAlertAlternateReturn #define Cancel NSAlertAlternateReturn
#define QuitAnyways NSAlertOtherReturn #define QuitAnyways NSAlertOtherReturn
@ -368,63 +400,70 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
* into NSApplication to call the corresponding NSDocumentController * into NSApplication to call the corresponding NSDocumentController
* methods if the app delegate didn't implement a given delegate method. * methods if the app delegate didn't implement a given delegate method.
*/ */
- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename - (BOOL) application:(NSApplication *)sender openFile: (NSString *)filename
{ {
return [self openDocumentWithContentsOfFile:filename display:YES] ? YES : NO; return [self openDocumentWithContentsOfFile:filename display:YES] ? YES : NO;
} }
- (BOOL)application:(NSApplication *)sender openTempFile:(NSString *)filename; - (BOOL) application:(NSApplication *)sender
openTempFile: (NSString *)filename;
{ {
return [self openDocumentWithContentsOfFile:filename display:YES] ? YES : NO; return [self openDocumentWithContentsOfFile:filename display:YES] ? YES : NO;
} }
- (BOOL)applicationOpenUntitledFile:(NSApplication *)sender - (BOOL) applicationOpenUntitledFile: (NSApplication *)sender
{ {
return [self openUntitledDocumentOfType:[self _defaultType] display:YES] ? YES : NO; return [self openUntitledDocumentOfType: [self _defaultType]
display: YES] ? YES : NO;
} }
- (BOOL)application:(id)sender openFileWithoutUI:(NSString *)filename - (BOOL) application:(id)sender openFileWithoutUI:(NSString *)filename
{ {
return [self openDocumentWithContentsOfFile:filename display:NO] ? YES : NO; return [self openDocumentWithContentsOfFile: filename display: NO] ?
YES : NO;
} }
- (BOOL)applicationShouldTerminate:(NSApplication *)sender - (BOOL) applicationShouldTerminate: (NSApplication *)sender
{ {
return [self reviewUnsavedDocumentsWithAlertTitle:@"Quit" cancellable:YES]; return [self reviewUnsavedDocumentsWithAlertTitle: @"Quit"
cancellable: YES];
} }
#endif #endif
- (void)_workspaceWillPowerOff:(NSNotification *)notification - (void) _workspaceWillPowerOff: (NSNotification *)notification
{ {
// FIXME -- localize. // FIXME -- localize.
[self reviewUnsavedDocumentsWithAlertTitle:@"Power" cancellable:NO]; [self reviewUnsavedDocumentsWithAlertTitle: @"Power" cancellable: NO];
} }
- (NSArray *)documents - (NSArray *) documents
{ {
return _documents; return _documents;
} }
- (BOOL)hasEditedDocuments; - (BOOL) hasEditedDocuments;
{ {
int i, count = [_documents count]; int i, count = [_documents count];
for (i=0; i<count; i++) for (i = 0; i < count; i++)
{ {
if ([[_documents objectAtIndex:i] isDocumentEdited]) if ([[_documents objectAtIndex: i] isDocumentEdited])
return YES; {
return YES;
}
} }
return NO; return NO;
} }
- (id)currentDocument - (id) currentDocument
{ {
return [self documentForWindow:[[NSApplication sharedApplication] mainWindow]]; return [self documentForWindow:
[[NSApplication sharedApplication] mainWindow]];
} }
- (NSString *)currentDirectory - (NSString *) currentDirectory
{ {
NSFileManager *manager = [NSFileManager defaultManager]; NSFileManager *manager = [NSFileManager defaultManager];
NSDocument *currentDocument = [self currentDocument]; NSDocument *currentDocument = [self currentDocument];
@ -432,98 +471,112 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
BOOL isDir = NO; BOOL isDir = NO;
if (directory && if (directory &&
[manager fileExistsAtPath:directory isDirectory:&isDir] && isDir) [manager fileExistsAtPath: directory isDirectory: &isDir] && isDir)
return directory; {
return directory;
}
//FIXME -- need to remember last saved directory, and return that here. //FIXME -- need to remember last saved directory, and return that here.
//Only return NSHomeDirectory if nothing's been saved yet. //Only return NSHomeDirectory if nothing's been saved yet.
return NSHomeDirectory(); return NSHomeDirectory ();
} }
- (id)documentForWindow:(NSWindow *)window - (id) documentForWindow: (NSWindow *)window
{ {
id document; id document;
if (window == nil) if (window == nil)
return nil; {
return nil;
if (![[window windowController] isKindOfClass:[NSWindowController class]]) }
return nil;
if (![[window windowController] isKindOfClass: [NSWindowController class]])
{
return nil;
}
document = [[window windowController] document]; document = [[window windowController] document];
if (![document isKindOfClass:[NSDocument class]]) if (![document isKindOfClass:[NSDocument class]])
return nil; {
return nil;
}
return document; return document;
} }
- (id)documentForFileName:(NSString *)fileName - (id) documentForFileName: (NSString *)fileName
{ {
int i, count = [_documents count]; int i, count = [_documents count];
for (i=0; i<count; i++) for (i = 0; i < count; i++)
{ {
NSDocument *document = [_documents objectAtIndex:i]; NSDocument *document = [_documents objectAtIndex: i];
if ([[document fileName] isEqualToString:fileName]) if ([[document fileName] isEqualToString: fileName])
return document;
}
return nil;
}
- (BOOL)validateMenuItem:(NSMenuItem *)anItem
{
if ([anItem action] == @selector(saveAllDocuments:))
return [self hasEditedDocuments];
return YES;
}
- (NSString *)displayNameForType:(NSString *)type
{
NSString *name = [TYPE_INFO(type) objectForKey:NSHumanReadableNameKey];
return name? name : type;
}
- (NSString *)typeFromFileExtension:(NSString *)fileExtension
{
int i, count = [_types count];
for (i=0; i<count;i++)
{
NSDictionary *typeInfo = [_types objectAtIndex:i];
if ([[typeInfo objectForKey:NSUnixExtensionsKey] containsObject:fileExtension] ||
[[typeInfo objectForKey:NSDOSExtensionsKey] containsObject:fileExtension])
{ {
return [typeInfo objectForKey:NSNameKey]; return document;
} }
} }
return nil; return nil;
} }
- (NSArray *)fileExtensionsFromType:(NSString *)type - (BOOL) validateMenuItem: (NSMenuItem *)anItem
{
if ([anItem action] == @selector(saveAllDocuments:))
{
return [self hasEditedDocuments];
}
return YES;
}
- (NSString *) displayNameForType: (NSString *)type
{
NSString *name = [TYPE_INFO(type) objectForKey: NSHumanReadableNameKey];
return name? name : type;
}
- (NSString *) typeFromFileExtension: (NSString *)fileExtension
{
int i, count = [_types count];
for (i = 0; i < count;i++)
{
NSDictionary *typeInfo = [_types objectAtIndex: i];
if ([[typeInfo objectForKey:NSUnixExtensionsKey]
containsObject: fileExtension] ||
[[typeInfo objectForKey:NSDOSExtensionsKey]
containsObject: fileExtension])
{
return [typeInfo objectForKey: NSNameKey];
}
}
return nil;
}
- (NSArray *) fileExtensionsFromType: (NSString *)type
{ {
NSDictionary *typeInfo = TYPE_INFO(type); NSDictionary *typeInfo = TYPE_INFO(type);
NSArray *unixExtensions = [typeInfo objectForKey:NSUnixExtensionsKey]; NSArray *unixExtensions = [typeInfo objectForKey: NSUnixExtensionsKey];
NSArray *dosExtensions = [typeInfo objectForKey:NSDOSExtensionsKey]; NSArray *dosExtensions = [typeInfo objectForKey: NSDOSExtensionsKey];
if (!dosExtensions) return unixExtensions; if (!dosExtensions) return unixExtensions;
if (!unixExtensions) return dosExtensions; if (!unixExtensions) return dosExtensions;
return [unixExtensions arrayByAddingObjectsFromArray:dosExtensions]; return [unixExtensions arrayByAddingObjectsFromArray: dosExtensions];
} }
- (Class)documentClassForType:(NSString *)type - (Class) documentClassForType: (NSString *)type
{ {
NSString *className = [TYPE_INFO(type) objectForKey:NSDocumentClassKey]; NSString *className = [TYPE_INFO(type) objectForKey: NSDocumentClassKey];
return className? NSClassFromString(className) : Nil; return className? NSClassFromString(className) : Nil;
} }
- (IBAction)clearRecentDocuments:(id)sender - (IBAction) clearRecentDocuments: (id)sender
{ {
[_recentDocuments removeAllObjects]; [_recentDocuments removeAllObjects];
} }
@ -531,20 +584,24 @@ static NSDictionary *TypeInfoForName(NSArray *types, NSString *typeName)
// The number of remembered recent documents // The number of remembered recent documents
#define MAX_DOCS 5 #define MAX_DOCS 5
- (void)noteNewRecentDocumentURL:(NSURL *)anURL - (void) noteNewRecentDocumentURL: (NSURL *)anURL
{ {
unsigned index = [_recentDocuments indexOfObject: anURL]; unsigned index = [_recentDocuments indexOfObject: anURL];
if (index != NSNotFound) if (index != NSNotFound)
// Always keep the current object at the end of the list {
[_recentDocuments removeObjectAtIndex: index]; // Always keep the current object at the end of the list
[_recentDocuments removeObjectAtIndex: index];
}
else if ([_recentDocuments count] > MAX_DOCS) else if ([_recentDocuments count] > MAX_DOCS)
[_recentDocuments removeObjectAtIndex: 0]; {
[_recentDocuments removeObjectAtIndex: 0];
}
[_recentDocuments addObject: anURL]; [_recentDocuments addObject: anURL];
} }
- (NSArray *)recentDocumentURLs - (NSArray *) recentDocumentURLs
{ {
return _recentDocuments; return _recentDocuments;
} }
@ -556,54 +613,56 @@ static NSString *NSEditorRole = @"Editor";
static NSString *NSViewerRole = @"Viewer"; static NSString *NSViewerRole = @"Viewer";
static NSString *NSNoRole = @"None"; static NSString *NSNoRole = @"None";
- (NSArray *)_editorAndViewerTypesForClass:(Class)documentClass - (NSArray *) _editorAndViewerTypesForClass: (Class)documentClass
{ {
int i, count = [_types count]; int i, count = [_types count];
NSMutableArray *types = [NSMutableArray arrayWithCapacity:count]; NSMutableArray *types = [NSMutableArray arrayWithCapacity: count];
NSString *docClassName = NSStringFromClass(documentClass); NSString *docClassName = NSStringFromClass (documentClass);
for (i=0; i<count; i++) for (i = 0; i < count; i++)
{ {
NSDictionary *typeInfo = [_types objectAtIndex:i]; NSDictionary *typeInfo = [_types objectAtIndex: i];
NSString *className = [typeInfo objectForKey:NSDocumentClassKey]; NSString *className = [typeInfo objectForKey: NSDocumentClassKey];
NSString *role = [typeInfo objectForKey:NSRoleKey]; NSString *role = [typeInfo objectForKey: NSRoleKey];
if ([docClassName isEqualToString:className] && if ([docClassName isEqualToString: className]
(role == nil || [role isEqual:NSEditorRole] || [role isEqual:NSViewerRole])) && (role == nil
|| [role isEqual: NSEditorRole]
|| [role isEqual: NSViewerRole]))
{ {
[types addObject:[typeInfo objectForKey:NSNameKey]]; [types addObject: [typeInfo objectForKey: NSNameKey]];
} }
} }
return types; return types;
} }
- (NSArray *)_editorTypesForClass:(Class)documentClass - (NSArray *) _editorTypesForClass: (Class)documentClass
{ {
int i, count = [_types count]; int i, count = [_types count];
NSMutableArray *types = [NSMutableArray arrayWithCapacity:count]; NSMutableArray *types = [NSMutableArray arrayWithCapacity: count];
NSString *docClassName = NSStringFromClass(documentClass); NSString *docClassName = NSStringFromClass (documentClass);
for (i=0; i<count; i++) for (i = 0; i < count; i++)
{ {
NSDictionary *typeInfo = [_types objectAtIndex:i]; NSDictionary *typeInfo = [_types objectAtIndex: i];
NSString *className = [typeInfo objectForKey:NSDocumentClassKey]; NSString *className = [typeInfo objectForKey: NSDocumentClassKey];
NSString *role = [typeInfo objectForKey:NSRoleKey]; NSString *role = [typeInfo objectForKey: NSRoleKey];
if ([docClassName isEqualToString:className] && if ([docClassName isEqualToString: className] &&
(role == nil || [role isEqual:NSEditorRole])) (role == nil || [role isEqual: NSEditorRole]))
{ {
[types addObject:[typeInfo objectForKey:NSNameKey]]; [types addObject: [typeInfo objectForKey: NSNameKey]];
} }
} }
return types; return types;
} }
- (NSArray *)_exportableTypesForClass:(Class)documentClass - (NSArray *) _exportableTypesForClass: (Class)documentClass
{ {
// Dunno what this method is for; maybe looks for filter types // Dunno what this method is for; maybe looks for filter types
return [self _editorTypesForClass:documentClass]; return [self _editorTypesForClass: documentClass];
} }
@end @end