Revision: 7459
http://skim-app.svn.sourceforge.net/skim-app/?rev=7459&view=rev
Author: hofman
Date: 2011-08-30 17:29:16 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
rename template manager methods, use term "templateType" instead of "fileName",
to hide the relation to files, as this is really an implementation detail.
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.m
trunk/SKDocumentController.m
trunk/SKFormatCommand.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/SKTemplateManager.h
trunk/SKTemplateManager.m
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/NSDocument_SKExtensions.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -144,8 +144,8 @@
- (NSString *)notesStringUsingTemplateFile:(NSString *)templateFile {
NSString *string = nil;
- if ([[SKTemplateManager sharedManager]
isRichTextTemplateFile:templateFile] == NO) {
- NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateFile:templateFile];
+ if ([[SKTemplateManager sharedManager]
isRichTextTemplateType:templateFile] == NO) {
+ NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateType:templateFile];
NSError *error = nil;
NSString *templateString = [[NSString alloc]
initWithContentsOfFile:templatePath encoding:NSUTF8StringEncoding error:&error];
string = [SKTemplateParser
stringByParsingTemplateString:templateString usingObject:self];
@@ -156,8 +156,8 @@
- (NSData *)notesDataUsingTemplateFile:(NSString *)templateFile {
NSData *data = nil;
- if ([[SKTemplateManager sharedManager]
isRichTextTemplateFile:templateFile]) {
- NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateFile:templateFile];
+ if ([[SKTemplateManager sharedManager]
isRichTextTemplateType:templateFile]) {
+ NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateType:templateFile];
NSDictionary *docAttributes = nil;
NSError *error = nil;
NSAttributedString *templateAttrString = [[NSAttributedString alloc]
initWithPath:templatePath documentAttributes:&docAttributes];
@@ -178,7 +178,7 @@
- (NSFileWrapper *)notesFileWrapperUsingTemplateFile:(NSString *)templateFile {
NSFileWrapper *fileWrapper = nil;
if ([[templateFile pathExtension] isCaseInsensitiveEqual:@"rtfd"]) {
- NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateFile:templateFile];
+ NSString *templatePath = [[SKTemplateManager sharedManager]
pathForTemplateType:templateFile];
NSDictionary *docAttributes = nil;
NSAttributedString *templateAttrString = [[NSAttributedString alloc]
initWithPath:templatePath documentAttributes:&docAttributes];
NSAttributedString *attrString = [SKTemplateParser
attributedStringByParsingTemplateAttributedString:templateAttrString
usingObject:self];
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKDocumentController.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -417,7 +417,7 @@
- (NSArray *)fileExtensionsFromType:(NSString *)documentTypeName {
NSArray *fileExtensions = [super fileExtensionsFromType:documentTypeName];
if ([fileExtensions count] == 0) {
- NSString *fileExtension = [[SKTemplateManager sharedManager]
fileNameExtensionForType:documentTypeName];
+ NSString *fileExtension = [[SKTemplateManager sharedManager]
fileNameExtensionForTemplateType:documentTypeName];
if (fileExtension)
fileExtensions = [NSArray arrayWithObject:fileExtension];
}
@@ -425,7 +425,7 @@
}
- (NSString *)displayNameForType:(NSString *)documentTypeName{
- return [[SKTemplateManager sharedManager]
displayNameForType:documentTypeName] ?: [super
displayNameForType:documentTypeName];
+ return [[SKTemplateManager sharedManager]
displayNameForTemplateType:documentTypeName] ?: [super
displayNameForType:documentTypeName];
}
@end
Modified: trunk/SKFormatCommand.m
===================================================================
--- trunk/SKFormatCommand.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKFormatCommand.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -62,7 +62,7 @@
attrString = template;
else if ([template isKindOfClass:[NSURL class]] == NO)
[self setScriptErrorNumber:NSArgumentsWrongScriptError];
- else if ([[SKTemplateManager sharedManager]
isRichTextTemplateFile:[template path]])
+ else if ([[SKTemplateManager sharedManager]
isRichTextTemplateType:[template path]])
attrString = [[[NSAttributedString alloc] initWithURL:template
documentAttributes:&docAttrs] autorelease];
else
string = [NSString stringWithContentsOfURL:template
encoding:NSUTF8StringEncoding error:NULL];
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKMainDocument.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -315,14 +315,14 @@
[writableTypes removeObject:SKBareXDVDocumentType];
}
if (saveOperation == NSSaveToOperation) {
- [[SKTemplateManager sharedManager] resetCustomTemplateFiles];
- [writableTypes addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateFiles]];
+ [[SKTemplateManager sharedManager] resetCustomTemplateTypes];
+ [writableTypes addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateTypes]];
}
return writableTypes;
}
- (NSString *)fileNameExtensionForType:(NSString *)typeName
saveOperation:(NSSaveOperationType)saveOperation {
- return [super fileNameExtensionForType:typeName
saveOperation:saveOperation] ?: [[SKTemplateManager sharedManager]
fileNameExtensionForType:typeName];
+ return [super fileNameExtensionForType:typeName
saveOperation:saveOperation] ?: [[SKTemplateManager sharedManager]
fileNameExtensionForTemplateType:typeName];
}
- (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
@@ -1837,13 +1837,8 @@
normalizedType = SKDVIDocumentType;
else if ([fileType isEqualToString:@"XDV"])
normalizedType = SKXDVDocumentType;
- else if ([[self writableTypesForSaveOperation:NSSaveToOperation]
containsObject:fileType] == NO) {
- NSArray *templateTypes = [[SKTemplateManager sharedManager]
customTemplateFiles];
- NSArray *templateTypesWithoutExtension = [templateTypes
valueForKey:@"stringByDeletingPathExtension"];
- NSUInteger idx = [templateTypesWithoutExtension
indexOfObject:fileType];
- if (idx != NSNotFound)
- normalizedType = [templateTypes objectAtIndex:idx];
- }
+ else if ([[self writableTypesForSaveOperation:NSSaveToOperation]
containsObject:fileType] == NO)
+ normalizedType = [[SKTemplateManager sharedManager]
normalizedTemplateType:fileType];
if (normalizedType) {
fileType = normalizedType;
NSMutableDictionary *arguments = [[command arguments] mutableCopy];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKNotesDocument.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -193,15 +193,15 @@
NSArray *writableTypes = [super
writableTypesForSaveOperation:saveOperation];
if (saveOperation == NSSaveToOperation) {
NSMutableArray *tmpArray = [[writableTypes mutableCopy] autorelease];
- [[SKTemplateManager sharedManager] resetCustomTemplateFiles];
- [tmpArray addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateFiles]];
+ [[SKTemplateManager sharedManager] resetCustomTemplateTypes];
+ [tmpArray addObjectsFromArray:[[SKTemplateManager sharedManager]
customTemplateTypes]];
writableTypes = tmpArray;
}
return writableTypes;
}
- (NSString *)fileNameExtensionForType:(NSString *)typeName
saveOperation:(NSSaveOperationType)saveOperation {
- return [super fileNameExtensionForType:typeName
saveOperation:saveOperation] ?: [[SKTemplateManager sharedManager]
fileNameExtensionForType:typeName];
+ return [super fileNameExtensionForType:typeName
saveOperation:saveOperation] ?: [[SKTemplateManager sharedManager]
fileNameExtensionForTemplateType:typeName];
}
- (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
@@ -828,7 +828,7 @@
if (fileType) {
NSString *normalizedType = nil;
if ([[self writableTypesForSaveOperation:NSSaveToOperation]
containsObject:fileType] == NO) {
- NSArray *templateTypes = [[SKTemplateManager sharedManager]
customTemplateFiles];
+ NSArray *templateTypes = [[SKTemplateManager sharedManager]
customTemplateTypes];
NSArray *templateTypesWithoutExtension = [templateTypes
valueForKey:@"stringByDeletingPathExtension"];
NSUInteger idx = [templateTypesWithoutExtension
indexOfObject:fileType];
if (idx != NSNotFound)
Modified: trunk/SKTemplateManager.h
===================================================================
--- trunk/SKTemplateManager.h 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKTemplateManager.h 2011-08-30 17:29:16 UTC (rev 7459)
@@ -40,18 +40,19 @@
@interface SKTemplateManager : NSObject {
- NSArray *customTemplateFiles;
+ NSArray *customTemplateTypes;
}
+ (id)sharedManager;
-- (NSArray *)customTemplateFiles;
-- (void)resetCustomTemplateFiles;
+- (NSArray *)customTemplateTypes;
+- (void)resetCustomTemplateTypes;
-- (NSString *)pathForTemplateFile:(NSString *)filename;
-- (NSString *)fileNameExtensionForType:(NSString *)typeName;
-- (NSString *)displayNameForType:(NSString *)typeName;
+- (NSString *)pathForTemplateType:(NSString *)typeName;
+- (NSString *)fileNameExtensionForTemplateType:(NSString *)typeName;
+- (NSString *)displayNameForTemplateType:(NSString *)typeName;
+- (NSString *)normalizedTemplateType:(NSString *)typeName;
-- (BOOL)isRichTextTemplateFile:(NSString *)templateFile;
+- (BOOL)isRichTextTemplateType:(NSString *)typeName;
@end
Modified: trunk/SKTemplateManager.m
===================================================================
--- trunk/SKTemplateManager.m 2011-08-30 16:55:32 UTC (rev 7458)
+++ trunk/SKTemplateManager.m 2011-08-30 17:29:16 UTC (rev 7459)
@@ -52,12 +52,12 @@
}
- (void)dealloc {
- SKDESTROY(customTemplateFiles);
+ SKDESTROY(customTemplateTypes);
[super dealloc];
}
-- (NSArray *)customTemplateFiles {
- if (customTemplateFiles == nil) {
+- (NSArray *)customTemplateTypes {
+ if (customTemplateTypes == nil) {
NSFileManager *fm = [NSFileManager defaultManager];
NSMutableArray *templates = [NSMutableArray array];
@@ -72,21 +72,21 @@
}
}
[templates sortUsingSelector:@selector(caseInsensitiveCompare:)];
- customTemplateFiles = [templates copy];
+ customTemplateTypes = [templates copy];
}
- return customTemplateFiles;
+ return customTemplateTypes;
}
-- (void)resetCustomTemplateFiles {
- SKDESTROY(customTemplateFiles);
+- (void)resetCustomTemplateTypes {
+ SKDESTROY(customTemplateTypes);
}
-- (NSString *)pathForTemplateFile:(NSString *)filename {
+- (NSString *)pathForTemplateType:(NSString *)typeName {
NSFileManager *fm = [NSFileManager defaultManager];
NSString *fullPath = nil;
for (NSString *appSupportPath in [[fm applicationSupportDirectories]
arrayByAddingObject:[[NSBundle mainBundle] sharedSupportPath]]) {
- fullPath = [[appSupportPath
stringByAppendingPathComponent:TEMPLATES_DIRECTORY]
stringByAppendingPathComponent:filename];
+ fullPath = [[appSupportPath
stringByAppendingPathComponent:TEMPLATES_DIRECTORY]
stringByAppendingPathComponent:typeName];
if ([fm fileExistsAtPath:fullPath] == NO)
fullPath = nil;
else break;
@@ -95,19 +95,26 @@
return fullPath;
}
-- (NSString *)fileNameExtensionForType:(NSString *)typeName {
- return [[self customTemplateFiles] containsObject:typeName] ? [typeName
pathExtension] : nil;
+- (NSString *)fileNameExtensionForTemplateType:(NSString *)typeName {
+ return [[self customTemplateTypes] containsObject:typeName] ? [typeName
pathExtension] : nil;
}
-- (NSString *)displayNameForType:(NSString *)typeName {
- return [[self customTemplateFiles] containsObject:typeName] ? [typeName
stringByDeletingPathExtension] : nil;
+- (NSString *)displayNameForTemplateType:(NSString *)typeName {
+ return [[self customTemplateTypes] containsObject:typeName] ? [typeName
stringByDeletingPathExtension] : nil;
}
-- (BOOL)isRichTextTemplateFile:(NSString *)templateFile {
+- (NSString *)normalizedTemplateType:(NSString *)typeName {
+ NSArray *templateTypes = [self customTemplateTypes];
+ NSArray *templateTypesWithoutExtension = [templateTypes
valueForKey:@"stringByDeletingPathExtension"];
+ NSUInteger idx = [templateTypesWithoutExtension indexOfObject:typeName];
+ return idx != NSNotFound ? [templateTypes objectAtIndex:idx] : nil;
+}
+
+- (BOOL)isRichTextTemplateType:(NSString *)isRichTextTemplateFile {
static NSSet *types = nil;
if (types == nil)
types = [[NSSet alloc] initWithObjects:@"rtf", @"doc", @"docx",
@"odt", @"webarchive", @"rtfd", nil];
- return [types containsObject:[[templateFile pathExtension]
lowercaseString]];
+ return [types containsObject:[[isRichTextTemplateFile pathExtension]
lowercaseString]];
}
@end
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
