Revision: 6787
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6787&view=rev
Author:   hofman
Date:     2010-09-09 10:12:21 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
add a custom class method to check whether a class is a PDF document rather 
than comparing the class or respondsToSelector, mainly in order to see whether 
we can set a page index for a bookmark

Modified Paths:
--------------
    trunk/NSDocument_SKExtensions.h
    trunk/NSDocument_SKExtensions.m
    trunk/SKBookmark.m
    trunk/SKBookmarkController.m
    trunk/SKMainDocument.m
    trunk/SKMainWindowController_UI.m

Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h     2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/NSDocument_SKExtensions.h     2010-09-09 10:12:21 UTC (rev 6787)
@@ -56,6 +56,8 @@
 
 @interface NSDocument (SKExtensions)
 
++ (BOOL)isPDFDocument;
+
 - (SKInteractionMode)systemInteractionMode;
 
 #pragma mark Document Setup

Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m     2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/NSDocument_SKExtensions.m     2010-09-09 10:12:21 UTC (rev 6787)
@@ -57,6 +57,8 @@
 
 @implementation NSDocument (SKExtensions)
 
++ (BOOL)isPDFDocument { return NO; }
+
 - (SKInteractionMode)systemInteractionMode { return SKNormalMode; }
 
 #pragma mark Document Setup

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/SKBookmark.m  2010-09-09 10:12:21 UTC (rev 6787)
@@ -40,6 +40,7 @@
 #import "BDAlias.h"
 #import "NSImage_SKExtensions.h"
 #import "SKBookmarkController.h"
+#import "NSDocument_SKExtensions.h"
 
 #define BOOKMARK_STRING     @"bookmark"
 #define SESSION_STRING      @"session"
@@ -273,7 +274,7 @@
                     if (aPageNumber > 0)
                         aPageNumber--;
                     else
-                        aPageNumber = [docClass 
instancesRespondToSelector:@selector(mainWindowController)] ? 0 : NSNotFound;
+                        aPageNumber = [docClass isPDFDocument] ? 0 : 
NSNotFound;
                     bookmark = [[SKBookmark alloc] initWithPath:aPath 
pageIndex:aPageNumber label:aLabel];
                 } else {
                     [[NSScriptCommand currentCommand] 
setScriptErrorNumber:NSArgumentsWrongScriptError];

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/SKBookmarkController.m        2010-09-09 10:12:21 UTC (rev 6787)
@@ -252,7 +252,7 @@
                     [self addBookmarksForPaths:[fm 
contentsOfDirectoryAtPath:path error:NULL] basePath:path toFolder:bookmark 
atIndex:0];
                 }
             } else if (docClass = [dc documentClassForType:fileType]) {
-                if (bookmark = [SKBookmark bookmarkWithPath:path 
pageIndex:(docClass == [SKMainDocument class] ? 0 : NSNotFound) label:[fm 
displayNameAtPath:path]]) {
+                if (bookmark = [SKBookmark bookmarkWithPath:path 
pageIndex:([docClass isPDFDocument] ? 0 : NSNotFound) label:[fm 
displayNameAtPath:path]]) {
                     [folder insertObject:bookmark 
inChildrenAtIndex:insertIndex++];
                 }
             }
@@ -381,7 +381,7 @@
         NSURL *fileURL = path ? [NSURL fileURLWithPath:path] : nil;
         if (fileURL && NO == [[NSFileManager defaultManager] 
isTrashedFileAtURL:fileURL] && 
             (document = [[NSDocumentController sharedDocumentController] 
openDocumentWithContentsOfURL:fileURL display:YES error:&error]) &&
-            [document respondsToSelector:@selector(mainWindowController)] &&
+            [document isPDFDocument] &&
             [bookmark pageIndex] != NSNotFound)
             [[document mainWindowController] setPageNumber:[bookmark 
pageIndex] + 1];
     }

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/SKMainDocument.m      2010-09-09 10:12:21 UTC (rev 6787)
@@ -159,6 +159,7 @@
 @synthesize mainWindowController;
 @dynamic pdfDocument, pdfView, fileIDStrings, synchronizer, snapshots, tags, 
rating, currentPage, activeNote, richText, selectionSpecifier, 
selectionQDRect,selectionPage, pdfViewSettings;
 
++ (BOOL)isPDFDocument { return YES; }
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-09-08 11:27:25 UTC (rev 6786)
+++ trunk/SKMainWindowController_UI.m   2010-09-09 10:12:21 UTC (rev 6787)
@@ -1142,7 +1142,7 @@
     NSError *error = nil;
     NSDocumentController *sdc = [NSDocumentController 
sharedDocumentController];
     id document = nil;
-    if ([sdc documentClassForType:[sdc typeForContentsOfURL:fileURL 
error:&error]] == [SKMainDocument class]) {
+    if ([[sdc documentClassForType:[sdc typeForContentsOfURL:fileURL 
error:&error]] isPDFDocument]) {
         if (document = [sdc openDocumentWithContentsOfURL:fileURL display:YES 
error:&error]) {
             NSUInteger pageIndex = [action pageIndex];
             if (pageIndex < [[document pdfDocument] pageCount]) {


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

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to