Revision: 5480
http://skim-app.svn.sourceforge.net/skim-app/?rev=5480&view=rev
Author: hofman
Date: 2009-07-14 11:48:27 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
add some error codes
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.h
trunk/SKDocumentController.m
trunk/SKNotesDocument.m
trunk/SKPDFDocument.m
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2009-07-14 11:23:13 UTC (rev 5479)
+++ trunk/NSDocument_SKExtensions.h 2009-07-14 11:48:27 UTC (rev 5480)
@@ -40,6 +40,12 @@
extern NSString *SKDocumentErrorDomain;
+enum {
+ SKWriteFileError = 1,
+ SKReadFileError = 2,
+ SKReadPasteboardError = 3
+};
+
@interface NSDocument (SKExtensions)
- (NSString *)notesStringUsingTemplateFile:(NSString *)templateFile;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2009-07-14 11:23:13 UTC (rev 5479)
+++ trunk/SKDocumentController.m 2009-07-14 11:48:27 UTC (rev 5480)
@@ -304,7 +304,7 @@
}
} else if (outError) {
- *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load data from clipboard", @"Error description"), NSLocalizedDescriptionKey,
nil]];
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadPasteboardError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load data from
clipboard", @"Error description"), NSLocalizedDescriptionKey, nil]];
}
return document;
@@ -321,7 +321,7 @@
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
[[SKDownloadController sharedDownloadController] showWindow:self];
} else if (outError) {
- *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load data from clipboard", @"Error description"), NSLocalizedDescriptionKey,
nil]];
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadPasteboardError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load data from
clipboard", @"Error description"), NSLocalizedDescriptionKey, nil]];
}
return document;
@@ -392,7 +392,7 @@
}
if (doc == nil && outError)
- *outError = error ?: [NSError
errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError
errorWithDomain:SKDocumentErrorDomain code:SKReadFileError
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load file", @"Error description"), NSLocalizedDescriptionKey, nil]];
return doc;
}
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2009-07-14 11:23:13 UTC (rev 5479)
+++ trunk/SKNotesDocument.m 2009-07-14 11:48:27 UTC (rev 5480)
@@ -209,7 +209,7 @@
}
if (data == nil && outError != NULL)
- *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes", @"Error description"), NSLocalizedDescriptionKey, nil]];
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes",
@"Error description"), NSLocalizedDescriptionKey, nil]];
return data;
}
@@ -239,7 +239,7 @@
}
if (didRead == NO && outError != NULL)
- *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load file", @"Error description"), NSLocalizedDescriptionKey, nil]];
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didRead;
}
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2009-07-14 11:23:13 UTC (rev 5479)
+++ trunk/SKPDFDocument.m 2009-07-14 11:48:27 UTC (rev 5480)
@@ -428,7 +428,7 @@
}
if (success == NO && outError != NULL)
- *outError = error ? : [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ? : [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return success;
}
@@ -478,19 +478,19 @@
if (data)
didWrite = [data writeToURL:absoluteURL options:0 error:&error];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes as RTF", @"Error description"), NSLocalizedDescriptionKey, nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes as RTF",
@"Error description"), NSLocalizedDescriptionKey, nil]];
} else if (SKIsNotesRTFDDocumentType(typeName)) {
NSFileWrapper *fileWrapper = [self notesRTFDFileWrapper];
if (fileWrapper)
didWrite = [fileWrapper writeToFile:[absoluteURL path]
atomically:NO updateFilenames:NO];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes as RTFD", @"Error description"), NSLocalizedDescriptionKey,
nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes as
RTFD", @"Error description"), NSLocalizedDescriptionKey, nil]];
} else if (SKIsNotesTextDocumentType(typeName)) {
NSString *string = [self notesString];
if (string)
didWrite = [string writeToURL:absoluteURL atomically:YES
encoding:NSUTF8StringEncoding error:&error];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes as text", @"Error description"), NSLocalizedDescriptionKey,
nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes as
text", @"Error description"), NSLocalizedDescriptionKey, nil]];
} else if (SKIsNotesFDFDocumentType(typeName)) {
NSString *filePath = [[self fileURL] path];
NSString *filename = [filePath lastPathComponent];
@@ -500,23 +500,23 @@
if (string)
didWrite = [string writeToURL:absoluteURL atomically:YES
encoding:NSISOLatin1StringEncoding error:&error];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes as FDF", @"Error description"), NSLocalizedDescriptionKey, nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes as FDF",
@"Error description"), NSLocalizedDescriptionKey, nil]];
} else if ([[typeName pathExtension] caseInsensitiveCompare:@"rtfd"] ==
NSOrderedSame) {
NSFileWrapper *fileWrapper = [self
notesFileWrapperUsingTemplateFile:typeName];
if (fileWrapper)
didWrite = [fileWrapper writeToFile:[absoluteURL path]
atomically:NO updateFilenames:NO];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes using template", @"Error description"),
NSLocalizedDescriptionKey, nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes using
template", @"Error description"), NSLocalizedDescriptionKey, nil]];
} else {
NSData *data = [self notesDataUsingTemplateFile:typeName];
if (data)
didWrite = [data writeToURL:absoluteURL options:0 error:&error];
else
- error = [NSError errorWithDomain:SKDocumentErrorDomain code:1
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to write notes using template", @"Error description"),
NSLocalizedDescriptionKey, nil]];
+ error = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write notes using
template", @"Error description"), NSLocalizedDescriptionKey, nil]];
}
if (didWrite == NO && outError != NULL)
- *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:SKWriteFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didWrite;
}
@@ -655,7 +655,7 @@
}
if (didRead == NO && outError != NULL)
- *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didRead;
}
@@ -807,7 +807,7 @@
[fileData release];
if (didRead == NO && outError != NULL)
- *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:0 userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
return didRead;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit