Revision: 7768
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7768&view=rev
Author:   hofman
Date:     2012-11-01 23:44:27 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Replace more path based code by URL based code

Modified Paths:
--------------
    trunk/NSDocument_SKExtensions.m
    trunk/NSFileManager_SKExtensions.h
    trunk/NSFileManager_SKExtensions.m
    trunk/SKBookmark.m
    trunk/SKDocumentController.m
    trunk/SKDownloadController.m
    trunk/SKDragImageView.m
    trunk/SKMainDocument.m
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteWindowController.m
    trunk/SKNotesDocument.m
    trunk/SKScriptMenu.m
    trunk/SKTemplateManager.m

Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m     2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/NSDocument_SKExtensions.m     2012-11-01 23:44:27 UTC (rev 7768)
@@ -290,7 +290,7 @@
 - (BOOL)isPDFDocument { return NO; }
 
 - (void)handleRevertScriptCommand:(NSScriptCommand *)command {
-    if ([self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtPath:[[self fileURL] path]]) {
+    if ([self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtURL:[self fileURL]]) {
         if ([self revertToContentsOfURL:[self fileURL] ofType:[self fileType] 
error:NULL] == NO) {
             [command setScriptErrorNumber:NSInternalScriptError];
             [command setScriptErrorString:@"Revert failed."];

Modified: trunk/NSFileManager_SKExtensions.h
===================================================================
--- trunk/NSFileManager_SKExtensions.h  2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/NSFileManager_SKExtensions.h  2012-11-01 23:44:27 UTC (rev 7768)
@@ -41,10 +41,14 @@
 
 @interface NSFileManager (SKExtensions)
 
+- (BOOL)fileExistsAtURL:(NSURL *)aURL;
+
 - (BOOL)isTrashedFileAtURL:(NSURL *)aURL;
 
 - (NSArray *)applicationSupportDirectoryURLs;
 
+- (NSString *)uniqueFile:(NSString *)path;
+
 @end
 
 // These functions are thread safe

Modified: trunk/NSFileManager_SKExtensions.m
===================================================================
--- trunk/NSFileManager_SKExtensions.m  2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/NSFileManager_SKExtensions.m  2012-11-01 23:44:27 UTC (rev 7768)
@@ -41,6 +41,10 @@
 
 @implementation NSFileManager (SKExtensions)
 
+- (BOOL)fileExistsAtURL:(NSURL *)aURL {
+    return [self fileExistsAtPath:[aURL path]];
+}
+
 - (BOOL)isTrashedFileAtURL:(NSURL *)aURL {
     NSCParameterAssert([aURL isFileURL]);    
     FSRef fileRef;
@@ -65,6 +69,16 @@
     return applicationSupportDirectoryURLs;
 }
 
+- (NSString *)uniqueFile:(NSString *)path {
+    NSString *uniquePath = path;
+    NSString *basePath = [path stringByDeletingPathExtension];
+    NSString *extension = [path pathExtension];
+    NSInteger i = 0;
+    while ([self fileExistsAtPath:path])
+        uniquePath = [[basePath stringByAppendingFormat:@"-%ld", (long)++i] 
stringByAppendingPathExtension:extension];
+    return uniquePath;
+}
+
 @end
 
 static NSString *SKUniqueDirectory(NSString *basePath) {

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKBookmark.m  2012-11-01 23:44:27 UTC (rev 7768)
@@ -632,7 +632,7 @@
                 if (aURL == nil) {
                     [[NSScriptCommand currentCommand] 
setScriptErrorNumber:NSRequiredArgumentsMissingScriptError];
                     [[NSScriptCommand currentCommand] 
setScriptErrorString:@"New file bookmark requires a file."];
-                } else if ([[NSFileManager defaultManager] 
fileExistsAtPath:[aURL path]] == NO) {
+                } else if ([[NSFileManager defaultManager] 
fileExistsAtURL:aURL] == NO) {
                     [[NSScriptCommand currentCommand] 
setScriptErrorNumber:NSArgumentsWrongScriptError];
                     [[NSScriptCommand currentCommand] 
setScriptErrorString:@"New file bookmark requires an existing file."];
                 } else if ((docClass = [[NSDocumentController 
sharedDocumentController] documentClassForContentsOfURL:aURL])) {

Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m        2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKDocumentController.m        2012-11-01 23:44:27 UTC (rev 7768)
@@ -314,7 +314,7 @@
     NSURL *fileURL = [[BDAlias aliasWithData:[setup 
objectForKey:SKDocumentSetupAliasKey]] fileURL];
     if(fileURL == nil && [setup objectForKey:SKDocumentSetupFileNameKey])
         fileURL = [NSURL fileURLWithPath:[setup 
objectForKey:SKDocumentSetupFileNameKey]];
-    if(fileURL && [[NSFileManager defaultManager] fileExistsAtPath:[fileURL 
path]] && NO == [[NSFileManager defaultManager] isTrashedFileAtURL:fileURL]) {
+    if(fileURL && [[NSFileManager defaultManager] fileExistsAtURL:fileURL] && 
NO == [[NSFileManager defaultManager] isTrashedFileAtURL:fileURL]) {
         if ((document = [self documentForURL:fileURL])) {
             // the document was already open, don't call makeWindowControllers 
because that adds new empty windows
             [document applySetup:setup];
@@ -344,8 +344,7 @@
         NSAppleEventDescriptor *event = [[NSAppleEventManager 
sharedAppleEventManager] currentAppleEvent];
         if ([event eventID] == kAEOpenDocuments && [event 
descriptorForKeyword:keyAESearchText]) {
             NSURL *pdfURL = [absoluteURL URLReplacingPathExtension:@"pdf"];
-            BOOL isDir;
-            if ([[NSFileManager defaultManager] fileExistsAtPath:[pdfURL path] 
isDirectory:&isDir] && isDir == NO)
+            if ([[NSFileManager defaultManager] fileExistsAtURL:pdfURL])
                 absoluteURL = pdfURL;
         }
     } else if ([ws type:type conformsToType:SKFolderDocumentType]) {

Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m        2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKDownloadController.m        2012-11-01 23:44:27 UTC (rev 7768)
@@ -50,6 +50,7 @@
 #import "SKDownloadPreferenceController.h"
 #import "NSError_SKExtensions.h"
 #import "NSEvent_SKExtensions.h"
+#import "NSFileManager_SKExtensions.h"
 
 #define PROGRESS_COLUMN 1
 #define RESUME_COLUMN   2
@@ -480,7 +481,7 @@
             menuItem = [menu addItemWithTitle:NSLocalizedString(@"Resume", 
@"Menu item title") action:@selector(resumeDownload:) target:self];
             [menuItem setRepresentedObject:download];
         }
-        if ([download status] == SKDownloadStatusFinished && [[NSFileManager 
defaultManager] fileExistsAtPath:[[download fileURL] path]]) {
+        if ([download status] == SKDownloadStatusFinished && [[NSFileManager 
defaultManager] fileExistsAtURL:[download fileURL]]) {
             menuItem = [menu addItemWithTitle:[NSLocalizedString(@"Open", 
@"Menu item title") stringByAppendingEllipsis] 
action:@selector(openDownloadedFile:) target:self];
             [menuItem setRepresentedObject:download];
             

Modified: trunk/SKDragImageView.m
===================================================================
--- trunk/SKDragImageView.m     2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKDragImageView.m     2012-11-01 23:44:27 UTC (rev 7768)
@@ -39,6 +39,7 @@
 #import "SKDragImageView.h"
 #import "NSMenu_SKExtensions.h"
 #import "NSEvent_SKExtensions.h"
+#import "NSFileManager_SKExtensions.h"
 
 @implementation SKDragImageView
 
@@ -54,14 +55,9 @@
         return;
     }
     
-    NSFileManager *fm = [NSFileManager defaultManager];
-    NSString *basePath = [NSTemporaryDirectory() 
stringByAppendingPathComponent:@"SkimNote"];
-    NSString *path = [basePath stringByAppendingPathExtension:@"tiff"];
-    NSInteger i = 0;
+    NSString *path = [NSTemporaryDirectory() 
stringByAppendingPathComponent:@"SkimNote.tiff"];
     
-    while ([fm fileExistsAtPath:path])
-        path = [[basePath stringByAppendingFormat:@"-%ld", (long)++i] 
stringByAppendingPathExtension:@"tiff"];
-    
+    path = [[NSFileManager defaultManager] uniqueFile:path];
     [[image TIFFRepresentation] writeToFile:path atomically:YES];
     [[NSWorkspace sharedWorkspace] openFile:path];
 }

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKMainDocument.m      2012-11-01 23:44:27 UTC (rev 7768)
@@ -425,7 +425,7 @@
     
     if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKAutoSaveSkimNotesKey]) {
         NSURL *notesURL = [absoluteURL URLReplacingPathExtension:@"skim"];
-        BOOL fileExists = [fm fileExistsAtPath:[notesURL path]];
+        BOOL fileExists = [fm fileExistsAtURL:notesURL];
         
         if (fileExists && (saveOperation == NSSaveAsOperation || saveOperation 
== NSSaveToOperation)) {
             NSAlert *alert = [NSAlert alertWithMessageText:[NSString 
stringWithFormat:NSLocalizedString(@"\"%@\" already exists. Do you want to 
replace it?", @"Message in alert dialog"), [notesURL lastPathComponent]]
@@ -832,7 +832,7 @@
                 }
                 if (pdfDoc) {
                     NSURL *url = [absoluteURL 
URLReplacingPathExtension:@"skim"];
-                    if ([[NSFileManager defaultManager] fileExistsAtPath:[url 
path]]) {
+                    if ([[NSFileManager defaultManager] fileExistsAtURL:url]) {
                         NSInteger readOption = [[NSUserDefaults 
standardUserDefaults] integerForKey:SKReadMissingNotesFromSkimFileOptionKey];
                         if (readOption == NSAlertOtherReturn) {
                             NSAlert *alert = [NSAlert 
alertWithMessageText:NSLocalizedString(@"Found Separate Notes", @"Message in 
alert dialog") 
@@ -1139,7 +1139,7 @@
 
 - (IBAction)saveArchive:(id)sender {
     NSURL *fileURL = [self fileURL];
-    if (fileURL && [[NSFileManager defaultManager] fileExistsAtPath:[fileURL 
path]] && [self isDocumentEdited] == NO) {
+    if (fileURL && [[NSFileManager defaultManager] fileExistsAtURL:fileURL] && 
[self isDocumentEdited] == NO) {
         NSSavePanel *sp = [NSSavePanel savePanel];
         [sp setRequiredFileType:@"tgz"];
         [sp setCanCreateDirectories:YES];
@@ -1267,7 +1267,7 @@
 
 - (IBAction)saveDiskImage:(id)sender {
     NSURL *fileURL = [self fileURL];
-    if (fileURL && [[NSFileManager defaultManager] fileExistsAtPath:[fileURL 
path]] && [self isDocumentEdited] == NO) {
+    if (fileURL && [[NSFileManager defaultManager] fileExistsAtURL:fileURL] && 
[self isDocumentEdited] == NO) {
         NSSavePanel *sp = [NSSavePanel savePanel];
         [sp setRequiredFileType:@"dmg"];
         [sp setCanCreateDirectories:YES];
@@ -1295,12 +1295,12 @@
 }
 
 - (IBAction)moveToTrash:(id)sender {
-    NSString *path = [[self fileURL] path];
-    if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
-        NSString *folderPath = [path stringByDeletingLastPathComponent];
-        NSString *fileName = [path lastPathComponent];
+    NSURL *fileURL = [self fileURL];
+    if ([[NSFileManager defaultManager] fileExistsAtURL:fileURL]) {
+        NSURL *folderURL = [fileURL URLByDeletingLastPathComponent];
+        NSString *fileName = [fileURL lastPathComponent];
         NSInteger tag = 0;
-        if ([[NSWorkspace sharedWorkspace] 
performFileOperation:NSWorkspaceRecycleOperation source:folderPath 
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag])
+        if ([[NSWorkspace sharedWorkspace] 
performFileOperation:NSWorkspaceRecycleOperation source:[folderURL path] 
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag])
             [self close];
         else NSBeep();
     } else NSBeep();
@@ -1341,8 +1341,7 @@
 
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
        if ([anItem action] == @selector(revertDocumentToSaved:)) {
-        NSString *fileName = [[self fileURL] path];
-        if (fileName == nil || [[NSFileManager defaultManager] 
fileExistsAtPath:fileName] == NO)
+        if ([self fileURL] == nil || [[NSFileManager defaultManager] 
fileExistsAtURL:[self fileURL]] == NO)
             return NO;
         return [self isDocumentEdited] || [fileUpdateChecker 
fileChangedOnDisk] ||
                NSOrderedAscending == [[self fileModificationDate] 
compare:[[[NSFileManager defaultManager] attributesOfItemAtPath:[[self fileURL] 
path] error:NULL] fileModificationDate]];
@@ -1351,11 +1350,9 @@
     } else if ([anItem action] == @selector(convertNotes:)) {
         return [[NSWorkspace sharedWorkspace] type:[self fileType] 
conformsToType:SKPDFDocumentType] && [[self pdfDocument] isLocked] == NO;
     } else if ([anItem action] == @selector(saveArchive:) || [anItem action] 
== @selector(saveDiskImage:) || [anItem action] == @selector(emailArchive:) || 
[anItem action] == @selector(emailDiskImage:)) {
-        NSString *path = [[self fileURL] path];
-        return path && [[NSFileManager defaultManager] fileExistsAtPath:path] 
&& [self isDocumentEdited] == NO;
+        return [self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtURL:[self fileURL]] && [self isDocumentEdited] == NO;
     } else if ([anItem action] == @selector(moveToTrash:)) {
-        NSString *path = [[self fileURL] path];
-        return path && [[NSFileManager defaultManager] fileExistsAtPath:path];
+        return [self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtURL:[self fileURL]];
     }
     return [super validateUserInterfaceItem:anItem];
 }
@@ -1962,7 +1959,7 @@
 }
 
 - (void)handleRevertScriptCommand:(NSScriptCommand *)command {
-    if ([self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtPath:[[self fileURL] path]]) {
+    if ([self fileURL] && [[NSFileManager defaultManager] 
fileExistsAtURL:[self fileURL]]) {
         if ([fileUpdateChecker isUpdatingFile] == NO && [self 
revertToContentsOfURL:[self fileURL] ofType:[self fileType] error:NULL] == NO) {
             [command setScriptErrorNumber:NSInternalScriptError];
             [command setScriptErrorString:@"Revert failed."];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKMainWindowController_UI.m   2012-11-01 23:44:27 UTC (rev 7768)
@@ -75,6 +75,7 @@
 #import "NSError_SKExtensions.h"
 #import "PDFView_SKExtensions.h"
 #import "NSInvocation_SKExtensions.h"
+#import "NSFileManager_SKExtensions.h"
 
 #define NOTES_KEY       @"notes"
 #define SNAPSHOTS_KEY   @"snapshots"
@@ -333,7 +334,7 @@
         NSUInteger idx = [rowIndexes firstIndex];
         if (idx != NSNotFound) {
             PDFPage *page = [[pdfView document] pageAtIndex:idx];
-            NSString *basePath = [[dropDestination path] 
stringByAppendingPathComponent:[self draggedFileNameForPage:page]];
+            NSString *path = [[dropDestination path] 
stringByAppendingPathComponent:[self draggedFileNameForPage:page]];
             NSString *pathExt = nil;
             NSData *data = nil;
             
@@ -345,12 +346,7 @@
                 data = [page TIFFDataForRect:[page boundsForBox:[pdfView 
displayBox]]];
             }
             
-            NSString *path = [basePath stringByAppendingPathExtension:pathExt];
-            NSFileManager *fm = [NSFileManager defaultManager];
-            NSInteger i = 0;
-            
-            while ([fm fileExistsAtPath:path])
-                path = [[basePath stringByAppendingFormat:@" - %ld", 
(long)++i] stringByAppendingPathExtension:pathExt];
+            path = [[NSFileManager defaultManager] uniqueFile:[path 
stringByAppendingPathExtension:pathExt]];
             if ([data writeToFile:path atomically:YES])
                 return [NSArray arrayWithObjects:[path lastPathComponent], 
nil];
         }
@@ -359,13 +355,8 @@
         if (idx != NSNotFound) {
             SKSnapshotWindowController *snapshot = [self 
objectInSnapshotsAtIndex:idx];
             PDFPage *page = [[pdfView document] pageAtIndex:[snapshot 
pageIndex]];
-            NSString *basePath = [[dropDestination path] 
stringByAppendingPathComponent:[self draggedFileNameForPage:page]];
-            NSString *path = [basePath stringByAppendingPathExtension:@"tiff"];
-            NSFileManager *fm = [NSFileManager defaultManager];
-            NSInteger i = 0;
-            
-            while ([fm fileExistsAtPath:path])
-                path = [[basePath stringByAppendingFormat:@" - %ld", 
(long)++i] stringByAppendingPathExtension:@"tiff"];
+            NSString *path = [[[dropDestination path] 
stringByAppendingPathComponent:[self draggedFileNameForPage:page]] 
stringByAppendingPathExtension:@"tiff"];
+            path = [[NSFileManager defaultManager] uniqueFile:path];
             if ([[[snapshot thumbnailWithSize:0.0] TIFFRepresentation] 
writeToFile:path atomically:YES])
                 return [NSArray arrayWithObjects:[path lastPathComponent], 
nil];
         }

Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m      2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKNoteWindowController.m      2012-11-01 23:44:27 UTC (rev 7768)
@@ -55,6 +55,7 @@
 #import "NSGraphics_SKExtensions.h"
 #import "SKNoteTextView.h"
 #import "NSInvocation_SKExtensions.h"
+#import "NSFileManager_SKExtensions.h"
 
 #define EM_DASH_CHARACTER (unichar)0x2014
 
@@ -345,12 +346,9 @@
         NSString *name = [note string];
         if ([name length] == 0)
             name = @"NoteImage";
-        NSString *basePath = [[dropDestination path] 
stringByAppendingPathComponent:name];
-        NSString *path = [basePath stringByAppendingPathExtension:@"tiff"];
-        NSInteger i = 0;
-        NSFileManager *fm = [NSFileManager defaultManager];
-        while ([fm fileExistsAtPath:path])
-            path = [[basePath stringByAppendingFormat:@"-%ld", (long)++i] 
stringByAppendingPathExtension:@"tiff"];
+        name = [name stringByAppendingPathExtension:@"tiff"];
+        NSString *path = [[[dropDestination path] 
stringByAppendingPathComponent:name] stringByAppendingPathExtension:@"tiff"];
+        path = [[NSFileManager defaultManager] uniqueFile:path];
         if ([[image TIFFRepresentation] writeToFile:path atomically:YES])
             return [NSArray arrayWithObjects:[path lastPathComponent], nil];
     }

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKNotesDocument.m     2012-11-01 23:44:27 UTC (rev 7768)
@@ -284,7 +284,7 @@
     } else if ([ws type:SKNotesFDFDocumentType conformsToType:typeName]) {
         NSString *filename = nil;
         NSURL *pdfURL = [[self fileURL] URLReplacingPathExtension:@"pdf"];
-        if ([[NSFileManager defaultManager] fileExistsAtPath:[pdfURL path]])
+        if ([[NSFileManager defaultManager] fileExistsAtURL:pdfURL])
             filename = [pdfURL lastPathComponent];
         data = [self notesFDFDataForFile:filename fileIDStrings:nil];
     } else {
@@ -440,7 +440,7 @@
 - (IBAction)openPDF:(id)sender {
     NSURL *url = sourceFileURL ?: [[self fileURL] 
URLReplacingPathExtension:@"pdf"];
     NSError *error = nil;
-    if ([[NSFileManager defaultManager] fileExistsAtPath:[url path]]) {
+    if ([[NSFileManager defaultManager] fileExistsAtURL:url]) {
         // resolve symlinks and aliases
         FSRef fileRef;
         Boolean isFolder, isAlias;
@@ -831,7 +831,7 @@
     if ([[[[[self windowControllers] objectAtIndex:0] window] toolbar] 
customizationPaletteIsRunning])
         return NO;
     else if ([[toolbarItem itemIdentifier] 
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
-        return [[NSFileManager defaultManager] 
fileExistsAtPath:[(sourceFileURL ?: [[self fileURL] 
URLReplacingPathExtension:@"pdf"]) path]];
+        return [[NSFileManager defaultManager] fileExistsAtURL:(sourceFileURL 
?: [[self fileURL] URLReplacingPathExtension:@"pdf"])];
     return YES;
 }
 

Modified: trunk/SKScriptMenu.m
===================================================================
--- trunk/SKScriptMenu.m        2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKScriptMenu.m        2012-11-01 23:44:27 UTC (rev 7768)
@@ -88,11 +88,12 @@
         NSInteger itemIndex = [[NSApp mainMenu] numberOfItems] - 1;
         NSFileManager *fm = [NSFileManager defaultManager];
         NSMutableArray *folders = [NSMutableArray array];
-        BOOL isDir;
         
         for (NSURL *folderURL in [fm applicationSupportDirectoryURLs]) {
+            NSNumber *isDir = nil;
             folderURL = [folderURL 
URLByAppendingPathComponent:SCRIPTS_FOLDER_NAME];
-            if ([fm fileExistsAtPath:[folderURL path] isDirectory:&isDir] && 
isDir)
+            [folderURL getResourceValue:&isDir forKey:NSURLIsDirectoryKey 
error:NULL];
+            if ([isDir boolValue])
                 [folders addObject:folderURL];
         }
         

Modified: trunk/SKTemplateManager.m
===================================================================
--- trunk/SKTemplateManager.m   2012-11-01 23:11:03 UTC (rev 7767)
+++ trunk/SKTemplateManager.m   2012-11-01 23:44:27 UTC (rev 7768)
@@ -62,10 +62,11 @@
         NSFileManager *fm = [NSFileManager defaultManager];
         NSMutableArray *templates = [NSMutableArray array];
         
-        for (NSURL *appSupportURL in [[NSFileManager defaultManager] 
applicationSupportDirectoryURLs]) {
+        for (NSURL *appSupportURL in [fm applicationSupportDirectoryURLs]) {
             NSURL *templatesURL = [appSupportURL 
URLByAppendingPathComponent:TEMPLATES_DIRECTORY];
-            BOOL isDir;
-            if ([fm fileExistsAtPath:[templatesURL path] isDirectory:&isDir] 
&& isDir) {
+            NSNumber *isDir = nil;
+            [appSupportURL getResourceValue:&isDir forKey:NSURLIsDirectoryKey 
error:NULL];
+            if ([isDir boolValue]) {
                 for (NSURL *url in [fm contentsOfDirectoryAtURL:templatesURL 
includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles 
error:NULL]) {
                     NSString *file = [url lastPathComponent];
                     if ([[file stringByDeletingPathExtension] 
isEqualToString:@"notesTemplate"] == NO &&
@@ -90,7 +91,7 @@
     
     for (NSURL *appSupportURL in [[fm applicationSupportDirectoryURLs] 
arrayByAddingObject:[[NSBundle mainBundle] sharedSupportPath]]) {
         url = [[appSupportURL URLByAppendingPathComponent:TEMPLATES_DIRECTORY] 
URLByAppendingPathComponent:typeName];
-        if ([fm fileExistsAtPath:[url path]] == NO)
+        if ([fm fileExistsAtURL:url] == NO)
             url = nil;
         else break;
     }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to