Revision: 7456
http://skim-app.svn.sourceforge.net/skim-app/?rev=7456&view=rev
Author: hofman
Date: 2011-08-30 11:43:51 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
rename accessors for custom template files
Modified Paths:
--------------
trunk/SKDocumentController.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/SKTemplateManager.h
trunk/SKTemplateManager.m
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2011-08-29 14:33:47 UTC (rev 7455)
+++ trunk/SKDocumentController.m 2011-08-30 11:43:51 UTC (rev 7456)
@@ -416,14 +416,14 @@
- (NSArray *)fileExtensionsFromType:(NSString *)documentTypeName {
NSArray *fileExtensions = [super fileExtensionsFromType:documentTypeName];
- if ([fileExtensions count] == 0 && [[[SKTemplateManager sharedManager]
templateFiles] containsObject:documentTypeName])
+ if ([fileExtensions count] == 0 && [[[SKTemplateManager sharedManager]
customTemplateFiles] containsObject:documentTypeName])
fileExtensions = [NSArray arrayWithObjects:[documentTypeName
pathExtension], nil];
return fileExtensions;
}
- (NSString *)displayNameForType:(NSString *)documentTypeName{
NSString *displayName = nil;
- if ([[[SKTemplateManager sharedManager] templateFiles]
containsObject:documentTypeName])
+ if ([[[SKTemplateManager sharedManager] customTemplateFiles]
containsObject:documentTypeName])
displayName = [documentTypeName stringByDeletingPathExtension];
else
displayName = [super displayNameForType:documentTypeName];
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-08-29 14:33:47 UTC (rev 7455)
+++ trunk/SKMainDocument.m 2011-08-30 11:43:51 UTC (rev 7456)
@@ -315,7 +315,7 @@
[writableTypes removeObject:SKBareXDVDocumentType];
}
if (saveOperation == NSSaveToOperation) {
- [writableTypes addObjectsFromArray:[[SKTemplateManager sharedManager]
templateFilesResetting]];
+ [writableTypes addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateFilesResetting]];
}
return writableTypes;
}
@@ -323,7 +323,7 @@
- (NSString *)fileNameExtensionForType:(NSString *)typeName
saveOperation:(NSSaveOperationType)saveOperation {
NSString *fileExtension = nil;
fileExtension = [super fileNameExtensionForType:typeName
saveOperation:saveOperation];
- if (fileExtension == nil && [[[SKTemplateManager sharedManager]
templateFiles] containsObject:typeName])
+ if (fileExtension == nil && [[[SKTemplateManager sharedManager]
customTemplateFiles] containsObject:typeName])
fileExtension = [typeName pathExtension];
return fileExtension;
}
@@ -1841,7 +1841,7 @@
else if ([fileType isEqualToString:@"XDV"])
normalizedType = SKXDVDocumentType;
else if ([[self writableTypesForSaveOperation:NSSaveToOperation]
containsObject:fileType] == NO) {
- NSArray *templateTypes = [[SKTemplateManager sharedManager]
templateFiles];
+ NSArray *templateTypes = [[SKTemplateManager sharedManager]
customTemplateFiles];
NSArray *templateTypesWithoutExtension = [templateTypes
valueForKey:@"stringByDeletingPathExtension"];
NSUInteger idx = [templateTypesWithoutExtension
indexOfObject:fileType];
if (idx != NSNotFound)
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2011-08-29 14:33:47 UTC (rev 7455)
+++ trunk/SKNotesDocument.m 2011-08-30 11:43:51 UTC (rev 7456)
@@ -193,7 +193,7 @@
NSArray *writableTypes = [super
writableTypesForSaveOperation:saveOperation];
if (saveOperation == NSSaveToOperation) {
NSMutableArray *tmpArray = [[writableTypes mutableCopy] autorelease];
- [tmpArray addObjectsFromArray:[[SKTemplateManager sharedManager]
templateFilesResetting]];
+ [tmpArray addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateFilesResetting]];
writableTypes = tmpArray;
}
return writableTypes;
@@ -202,7 +202,7 @@
- (NSString *)fileNameExtensionForType:(NSString *)typeName
saveOperation:(NSSaveOperationType)saveOperation {
NSString *fileExtension = nil;
fileExtension = [super fileNameExtensionForType:typeName
saveOperation:saveOperation];
- if (fileExtension == nil && [[[SKTemplateManager sharedManager]
templateFiles] containsObject:typeName])
+ if (fileExtension == nil && [[[SKTemplateManager sharedManager]
customTemplateFiles] containsObject:typeName])
fileExtension = [typeName pathExtension];
return fileExtension;
}
@@ -831,7 +831,7 @@
if (fileType) {
NSString *normalizedType = nil;
if ([[self writableTypesForSaveOperation:NSSaveToOperation]
containsObject:fileType] == NO) {
- NSArray *templateTypes = [[SKTemplateManager sharedManager]
templateFiles];
+ NSArray *templateTypes = [[SKTemplateManager sharedManager]
customTemplateFiles];
NSArray *templateTypesWithoutExtension = [templateTypes
valueForKey:@"stringByDeletingPathExtension"];
NSUInteger idx = [templateTypesWithoutExtension
indexOfObject:fileType];
if (idx != NSNotFound)
Modified: trunk/SKTemplateManager.h
===================================================================
--- trunk/SKTemplateManager.h 2011-08-29 14:33:47 UTC (rev 7455)
+++ trunk/SKTemplateManager.h 2011-08-30 11:43:51 UTC (rev 7456)
@@ -40,13 +40,13 @@
@interface SKTemplateManager : NSObject {
- NSArray *templateFiles;
+ NSArray *customTemplateFiles;
}
+ (id)sharedManager;
-- (NSArray *)templateFiles;
-- (NSArray *)templateFilesResetting;
+- (NSArray *)customTemplateFiles;
+- (NSArray *)customTemplateFilesResetting;
- (NSString *)pathForTemplateFile:(NSString *)filename;
Modified: trunk/SKTemplateManager.m
===================================================================
--- trunk/SKTemplateManager.m 2011-08-29 14:33:47 UTC (rev 7455)
+++ trunk/SKTemplateManager.m 2011-08-30 11:43:51 UTC (rev 7456)
@@ -52,12 +52,12 @@
}
- (void)dealloc {
- SKDESTROY(templateFiles);
+ SKDESTROY(customTemplateFiles);
[super dealloc];
}
-- (NSArray *)templateFiles {
- if (templateFiles == nil) {
+- (NSArray *)customTemplateFiles {
+ if (customTemplateFiles == nil) {
NSFileManager *fm = [NSFileManager defaultManager];
NSMutableArray *templates = [NSMutableArray array];
@@ -72,14 +72,14 @@
}
}
[templates sortUsingSelector:@selector(caseInsensitiveCompare:)];
- templateFiles = [templates copy];
+ customTemplateFiles = [templates copy];
}
- return templateFiles;
+ return customTemplateFiles;
}
-- (NSArray *)templateFilesResetting {
- SKDESTROY(templateFiles);
- return [self templateFiles];
+- (NSArray *)customTemplateFilesResetting {
+ SKDESTROY(customTemplateFiles);
+ return [self customTemplateFiles];
}
- (NSString *)pathForTemplateFile:(NSString *)filename {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
