Revision: 7076
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7076&view=rev
Author:   hofman
Date:     2011-01-21 16:16:05 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
convenience method to identify user cancelled error

Modified Paths:
--------------
    trunk/NSError_SKExtensions.h
    trunk/NSError_SKExtensions.m
    trunk/SKApplicationController.m
    trunk/SKBookmarkController.m
    trunk/SKDocumentController.m
    trunk/SKDownloadController.m
    trunk/SKFileUpdateChecker.m
    trunk/SKMainDocument.m
    trunk/SKMainWindowController_UI.m
    trunk/SKNotesDocument.m

Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h        2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/NSError_SKExtensions.h        2011-01-21 16:16:05 UTC (rev 7076)
@@ -53,4 +53,6 @@
 + (id)readPasteboardErrorWithLocalizedDescription:(NSString *)description;
 + (id)userCancelledErrorWithUnderlyingError:(NSError *)error;
 
+- (BOOL)isUserCancelledError;
+
 @end

Modified: trunk/NSError_SKExtensions.m
===================================================================
--- trunk/NSError_SKExtensions.m        2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/NSError_SKExtensions.m        2011-01-21 16:16:05 UTC (rev 7076)
@@ -58,4 +58,8 @@
     return [NSError errorWithDomain:NSCocoaErrorDomain 
code:NSUserCancelledError userInfo:[NSDictionary 
dictionaryWithObjectsAndKeys:error, NSUnderlyingErrorKey, nil]];
 }
 
+- (BOOL)isUserCancelledError {
+    return [[self domain] isEqualToString:NSCocoaErrorDomain] && [self code] 
== NSUserCancelledError;
+}
+
 @end

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKApplicationController.m     2011-01-21 16:16:05 UTC (rev 7076)
@@ -73,6 +73,7 @@
 #import "SKScriptMenu.h"
 #import "NSScreen_SKExtensions.h"
 #import "PDFAnnotation_SKExtensions.h"
+#import "NSError_SKExtensions.h"
 
 #define WEBSITE_URL @"http://skim-app.sourceforge.net/";
 #define WIKI_URL    @"http://sourceforge.net/apps/mediawiki/skim-app/";
@@ -165,8 +166,7 @@
         
         while (dict = [fileEnum nextObject]) {
             error = nil;
-            if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithSetup:dict error:&error] && error &&
-                ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO || 
[error code] != NSUserCancelledError))
+            if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithSetup:dict error:&error] && error && [error 
isUserCancelledError] == NO)
                 [NSApp presentError:error];
         }
     }

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKBookmarkController.m        2011-01-21 16:16:05 UTC (rev 7076)
@@ -51,6 +51,7 @@
 #import "SKDocumentController.h"
 #import "SKSeparatorCell.h"
 #import "NSMenu_SKExtensions.h"
+#import "NSError_SKExtensions.h"
 
 #define SKBookmarkRowsPboardType @"SKBookmarkRowsPboardType"
 
@@ -358,7 +359,7 @@
             [bookmark pageIndex] != NSNotFound)
             [[document mainWindowController] setPageNumber:[bookmark 
pageIndex] + 1];
     }
-    if (document == nil && error && ([[error domain] 
isEqualToString:NSCocoaErrorDomain] == NO || [error code] != 
NSUserCancelledError))
+    if (document == nil && error && [error isUserCancelledError] == NO)
         [NSApp presentError:error];
 }
 

Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m        2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKDocumentController.m        2011-01-21 16:16:05 UTC (rev 7076)
@@ -271,7 +271,7 @@
     NSError *error = nil;
     id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard 
generalPasteboard] error:&error];
     
-    if (document == nil && error && ([[error domain] 
isEqualToString:NSCocoaErrorDomain] == NO || [error code] != 
NSUserCancelledError))
+    if (document == nil && error && [error isUserCancelledError] == NO)
         [NSApp presentError:error];
 }
 

Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m        2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKDownloadController.m        2011-01-21 16:16:05 UTC (rev 7076)
@@ -48,6 +48,7 @@
 #import "NSGeometry_SKExtensions.h"
 #import "NSWindowController_SKExtensions.h"
 #import "SKDownloadPreferenceController.h"
+#import "NSError_SKExtensions.h"
 
 #define PROGRESS_COLUMN 1
 #define RESUME_COLUMN   2
@@ -269,8 +270,7 @@
     } else {
         NSURL *fileURL = [NSURL fileURLWithPath:[download filePath]];
         NSError *error;
-        if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:fileURL display:YES error:&error] &&
-            ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO || 
[error code] != NSUserCancelledError))
+        if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:fileURL display:YES error:&error] && [error 
isUserCancelledError] == NO)
             [NSApp presentError:error];
     }
 }
@@ -307,7 +307,7 @@
         NSURL *URL = [NSURL fileURLWithPath:[download filePath]];
         NSError *error = nil;
         id document = [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:URL display:YES error:&error];
-        if (document == nil && ([[error domain] 
isEqualToString:NSCocoaErrorDomain] == NO || [error code] != 
NSUserCancelledError))
+        if (document == nil && [error isUserCancelledError] == NO)
             [NSApp presentError:error];
         
         if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKAutoRemoveFinishedDownloadsKey]) {

Modified: trunk/SKFileUpdateChecker.m
===================================================================
--- trunk/SKFileUpdateChecker.m 2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKFileUpdateChecker.m 2011-01-21 16:16:05 UTC (rev 7076)
@@ -44,6 +44,7 @@
 #import <SkimNotes/SkimNotes.h>
 #import "NSUserDefaultsController_SKExtensions.h"
 #import "NSString_SKExtensions.h"
+#import "NSError_SKExtensions.h"
 
 #define SKAutoReloadFileUpdateKey @"SKAutoReloadFileUpdate"
 
@@ -153,8 +154,7 @@
 - (BOOL)revertDocument {
     NSError *error = nil;
     BOOL didRevert = [document revertToContentsOfURL:[document fileURL] 
ofType:[document fileType] error:&error];
-    if (didRevert == NO && error != nil && 
-        ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO || [error 
code] != NSUserCancelledError))
+    if (didRevert == NO && error != nil && [error isUserCancelledError] == NO)
         [document presentError:error modalForWindow:[document windowForSheet] 
delegate:nil didPresentSelector:NULL contextInfo:NULL];
     return didRevert;
 }

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKMainDocument.m      2011-01-21 16:16:05 UTC (rev 7076)
@@ -1240,8 +1240,7 @@
 - (void)revertAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode 
contextInfo:(void *)contextInfo {
     if (returnCode == NSAlertDefaultReturn) {
         NSError *error = nil;
-        if (NO == [self revertToContentsOfURL:[self fileURL] ofType:[self 
fileType] error:&error] &&
-            ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO || 
[error code] != NSUserCancelledError)) {
+        if (NO == [self revertToContentsOfURL:[self fileURL] ofType:[self 
fileType] error:&error] && [error isUserCancelledError] == NO) {
             [[alert window] orderOut:nil];
             [self presentError:error modalForWindow:[self windowForSheet] 
delegate:nil didPresentSelector:NULL contextInfo:NULL];
         }

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKMainWindowController_UI.m   2011-01-21 16:16:05 UTC (rev 7076)
@@ -72,6 +72,7 @@
 #import "SKSplitView.h"
 #import "NSEvent_SKExtensions.h"
 #import "SKDocumentController.h"
+#import "NSError_SKExtensions.h"
 
 #define NOTES_KEY       @"notes"
 #define SNAPSHOTS_KEY   @"snapshots"
@@ -1156,7 +1157,7 @@
                     [[document pdfView] goToDestination:dest];
                 }
             }
-        } else if (error && ([[error domain] 
isEqualToString:NSCocoaErrorDomain] == NO || [error code] != 
NSUserCancelledError)) {
+        } else if (error && [error isUserCancelledError] == NO) {
             [NSApp presentError:error];
         }
     } else if (fileURL) {
@@ -1171,7 +1172,7 @@
     id document = nil;
     if ([sdc documentClassForContentsOfURL:url]) {
         document = [sdc openDocumentWithContentsOfURL:url display:YES 
error:&error];
-        if (document == nil && error && ([[error domain] 
isEqualToString:NSCocoaErrorDomain] == NO || [error code] != 
NSUserCancelledError))
+        if (document == nil && error && [error isUserCancelledError] == NO)
             [NSApp presentError:error];
     } else {
         [[NSWorkspace sharedWorkspace] openURL:url];

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKNotesDocument.m     2011-01-21 16:16:05 UTC (rev 7076)
@@ -400,8 +400,7 @@
         }
         if (url == nil)
             url = [NSURL fileURLWithPath:path];
-        if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:url display:YES error:&error] &&
-            ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO || 
[error code] != NSUserCancelledError))
+        if (nil == [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:url display:YES error:&error] && [error 
isUserCancelledError] == NO)
             [NSApp presentError:error];
     } else NSBeep();
 }


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 (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to