Revision: 7100
http://skim-app.svn.sourceforge.net/skim-app/?rev=7100&view=rev
Author: hofman
Date: 2011-02-13 13:01:30 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
remove an intermediate method that was used only in one place
Modified Paths:
--------------
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2011-02-11 16:06:30 UTC (rev 7099)
+++ trunk/SKDocumentController.h 2011-02-13 13:01:30 UTC (rev 7100)
@@ -69,8 +69,6 @@
}
- (IBAction)newDocumentFromClipboard:(id)sender;
-// this method may return an SKDownload instance
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
// this method may return an SKDownload instance
- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2011-02-11 16:06:30 UTC (rev 7099)
+++ trunk/SKDocumentController.m 2011-02-13 13:01:30 UTC (rev 7100)
@@ -259,17 +259,6 @@
return document;
}
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
- NSError *error;
- id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
- if (document == nil) {
- document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
- if (document == nil && outError)
- *outError = error;
- }
- return document;
-}
-
- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
id document = nil;
@@ -320,8 +309,10 @@
- (IBAction)newDocumentFromClipboard:(id)sender {
NSError *error = nil;
- id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
-
+ NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+ id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
+ if (document == nil)
+ document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
