Revision: 4064
http://skim-app.svn.sourceforge.net/skim-app/?rev=4064&view=rev
Author: hofman
Date: 2008-06-23 04:36:00 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
Use filemanager method from SkimNotes framework to find files in PDF bundle
Modified Paths:
--------------
trunk/SKPDFDocument.m
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-06-23 10:12:39 UTC (rev 4063)
+++ trunk/SKPDFDocument.m 2008-06-23 11:36:00 UTC (rev 4064)
@@ -86,12 +86,6 @@
static void *SKPDFDocumentDefaultsObservationContext = (void
*)@"SKPDFDocumentDefaultsObservationContext";
[EMAIL PROTECTED] NSFileManager (SKPDFDocumentExtensions)
-- (NSString *)subfileWithExtension:(NSString *)extensions
inPDFBundleAtPath:(NSString *)path;
[EMAIL PROTECTED]
-
-#pragma mark -
-
@interface SKPDFDocument (SKPrivate)
- (void)setPDFData:(NSData *)data;
@@ -468,7 +462,7 @@
NSString *filePath = [[self fileURL] path];
NSString *filename = [filePath lastPathComponent];
if (filename && SKIsPDFBundleDocumentType([self fileType])) {
- NSString *pdfFile = [[NSFileManager defaultManager]
subfileWithExtension:@"pdf" inPDFBundleAtPath:filePath];
+ NSString *pdfFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"pdf" inPDFBundleAtPath:filePath error:NULL];
filename = pdfFile ? [filename
stringByAppendingPathComponent:pdfFile] : nil;
}
NSString *string = [self notesFDFStringForFile:filename];
@@ -721,7 +715,7 @@
NSString *filePath = [[self fileURL] path];
NSString *filename = [filePath lastPathComponent];
if (filename && SKIsPDFBundleDocumentType([self fileType])) {
- NSString *pdfFile = [[NSFileManager defaultManager]
subfileWithExtension:@"pdf" inPDFBundleAtPath:filePath];
+ NSString *pdfFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"pdf" inPDFBundleAtPath:filePath error:NULL];
filename = pdfFile ? [filename stringByAppendingPathComponent:pdfFile]
: nil;
}
return [self notesFDFStringForFile:filename];
@@ -1238,7 +1232,7 @@
if (extension) {
NSString *theUTI =
[(id)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension,
(CFStringRef)extension, NULL) autorelease];
if ([extension caseInsensitiveCompare:@"pdfd"] == NSOrderedSame ||
(theUTI && UTTypeConformsTo((CFStringRef)theUTI,
CFSTR("net.sourceforge.skim-app.pdfd")))) {
- NSString *pdfFile = [[NSFileManager defaultManager]
subfileWithExtension:@"pdf" inPDFBundleAtPath:fileName];
+ NSString *pdfFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"pdf" inPDFBundleAtPath:fileName error:NULL];
if (pdfFile == nil) {
isUpdatingFile = NO;
receivedFileUpdateNotification = NO;
@@ -2070,23 +2064,3 @@
}
@end
-
-
[EMAIL PROTECTED] NSFileManager (SKPDFDocumentExtensions)
-
-- (NSString *)subfileWithExtension:(NSString *)extension
inPDFBundleAtPath:(NSString *)path {
- NSArray *subfiles = [self subpathsAtPath:path];
- NSString *fileName = [[[path stringByDeletingLastPathComponent]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
- NSString *pdfFile = nil;
-
- if ([subfiles containsObject:fileName]) {
- pdfFile = fileName;
- } else {
- unsigned int idx = [[subfiles
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:extension];
- if (idx != NSNotFound)
- pdfFile = [subfiles objectAtIndex:idx];
- }
- return pdfFile;
-}
-
[EMAIL PROTECTED]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
