Revision: 6575
http://skim-app.svn.sourceforge.net/skim-app/?rev=6575&view=rev
Author: hofman
Date: 2010-06-08 09:42:55 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
small code reorganization
Modified Paths:
--------------
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2010-06-07 09:10:38 UTC (rev 6574)
+++ trunk/SKMainDocument.m 2010-06-08 09:42:55 UTC (rev 6575)
@@ -272,7 +272,7 @@
[self
performSelector:@selector(undoableActionDoesntDirtyDocumentDeferred:)
withObject:[NSNumber numberWithBool:[[self undoManager] isUndoing]]
afterDelay:0.0];
}
-#pragma mark Document read/write
+#pragma mark Writing
- (NSArray *)writableTypesForSaveOperation:(NSSaveOperationType)saveOperation {
NSMutableArray *writableTypes = [[[super
writableTypesForSaveOperation:saveOperation] mutableCopy] autorelease];
@@ -590,36 +590,6 @@
return didWrite;
}
-- (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName
error:(NSError **)outError{
- BOOL disableAlert = [[NSUserDefaults standardUserDefaults]
boolForKey:SKDisableReloadAlertKey] || [[self windowForSheet] attachedSheet];
-
- if (disableAlert == NO) {
- [[[self windowForSheet] attachedSheet] orderOut:self];
-
- [[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] setIndeterminate:YES];
- [[self progressController] beginSheetModalForWindow:[self
windowForSheet]];
- }
-
- BOOL success = [super revertToContentsOfURL:absoluteURL ofType:typeName
error:outError];
-
- if (success) {
- [self setDataFromTmpData];
- [[self undoManager] removeAllActions];
- // file watching could have been disabled if the file was deleted
- if (watchedFile == nil && fileUpdateTimer == nil)
- [self checkFileUpdatesIfNeeded];
- }
-
- [tmpData release];
- tmpData = nil;
-
- if (disableAlert == NO)
- [[self progressController] dismissSheet:nil];
-
- return success;
-}
-
- (NSDictionary *)fileAttributesToWriteToURL:(NSURL *)absoluteURL
ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation
originalContentsURL:(NSURL *)absoluteOriginalContentsURL error:(NSError
**)outError {
NSMutableDictionary *dict = [[[super
fileAttributesToWriteToURL:absoluteURL ofType:typeName
forSaveOperation:saveOperation originalContentsURL:absoluteOriginalContentsURL
error:outError] mutableCopy] autorelease];
@@ -644,6 +614,8 @@
return dict;
}
+#pragma mark Reading
+
- (void)setPDFData:(NSData *)data {
if (pdfData != data) {
[pdfData release];
@@ -847,6 +819,36 @@
return didRead;
}
+- (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName
error:(NSError **)outError{
+ BOOL disableAlert = [[NSUserDefaults standardUserDefaults]
boolForKey:SKDisableReloadAlertKey] || [[self windowForSheet] attachedSheet];
+
+ if (disableAlert == NO) {
+ [[[self windowForSheet] attachedSheet] orderOut:self];
+
+ [[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
+ [[self progressController] setIndeterminate:YES];
+ [[self progressController] beginSheetModalForWindow:[self
windowForSheet]];
+ }
+
+ BOOL success = [super revertToContentsOfURL:absoluteURL ofType:typeName
error:outError];
+
+ if (success) {
+ [self setDataFromTmpData];
+ [[self undoManager] removeAllActions];
+ // file watching could have been disabled if the file was deleted
+ if (watchedFile == nil && fileUpdateTimer == nil)
+ [self checkFileUpdatesIfNeeded];
+ }
+
+ [tmpData release];
+ tmpData = nil;
+
+ if (disableAlert == NO)
+ [[self progressController] dismissSheet:nil];
+
+ return success;
+}
+
#pragma mark Actions
- (IBAction)printDocument:(id)sender{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit