Revision: 5439
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5439&view=rev
Author:   hofman
Date:     2009-06-19 11:50:48 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
simplify API for opening  bookmark

Modified Paths:
--------------
    trunk/SKApplicationController.m
    trunk/SKBookmarkController.h
    trunk/SKBookmarkController.m

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2009-06-18 16:52:10 UTC (rev 5438)
+++ trunk/SKApplicationController.m     2009-06-19 11:50:48 UTC (rev 5439)
@@ -331,8 +331,7 @@
 }
 
 - (IBAction)openBookmark:(id)sender {
-    SKBookmark *bookmark = [sender representedObject];
-    [[SKBookmarkController sharedBookmarkController] openBookmarks:[NSArray 
arrayWithObjects:bookmark, nil]];
+    [[SKBookmarkController sharedBookmarkController] openBookmark:[sender 
representedObject]];
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {

Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h        2009-06-18 16:52:10 UTC (rev 5438)
+++ trunk/SKBookmarkController.h        2009-06-19 11:50:48 UTC (rev 5439)
@@ -58,8 +58,9 @@
 - (void)addBookmarkForSetup:(NSDictionary *)setupDict label:(NSString *)label 
toFolder:(SKBookmark *)folder;
 - (void)addBookmarkForPaths:(NSArray *)paths pageIndexes:(NSArray 
*)pageIndexes label:(NSString *)label toFolder:(SKBookmark *)folder;
 - (void)addBookmarkForSetups:(NSArray *)setupDicts label:(NSString *)label 
toFolder:(SKBookmark *)folder;
-- (void)openBookmarks:(NSArray *)items;
 
+- (void)openBookmark:(SKBookmark *)bookmark;
+
 - (IBAction)doubleClickBookmark:(id)sender;
 - (IBAction)insertBookmarkFolder:(id)sender;
 - (IBAction)insertBookmarkSeparator:(id)sender;

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2009-06-18 16:52:10 UTC (rev 5438)
+++ trunk/SKBookmarkController.m        2009-06-19 11:50:48 UTC (rev 5439)
@@ -376,7 +376,7 @@
     return bookmarksPath;
 }
 
-- (void)openBookmark:(SKBookmark *)bookmark {
+- (void)openFileBookmark:(SKBookmark *)bookmark {
     id document = nil;
     NSError *error = nil;
     NSDictionary *dict = [bookmark properties];
@@ -393,18 +393,13 @@
         [NSApp presentError:error];
 }
 
-- (void)openBookmarks:(NSArray *)items {
-    NSEnumerator *bmEnum = [items objectEnumerator];
-    SKBookmark *bm;
-    
-    while (bm = [bmEnum nextObject]) {
-        if ([bm bookmarkType] == SKBookmarkTypeSession) {
-            NSInteger i = [bm countOfChildren];
-            while (i--)
-                [self openBookmark:[bm objectInChildrenAtIndex:i]];
-        } else if ([bm bookmarkType] == SKBookmarkTypeBookmark) {
-            [self openBookmark:bm];
-        }
+- (void)openBookmark:(SKBookmark *)bookmark {
+    if ([bookmark bookmarkType] == SKBookmarkTypeSession) {
+        NSInteger i = [bookmark countOfChildren];
+        while (i--)
+            [self openFileBookmark:[bookmark objectInChildrenAtIndex:i]];
+    } else if ([bookmark bookmarkType] == SKBookmarkTypeBookmark) {
+        [self openFileBookmark:bookmark];
     }
 }
 
@@ -412,7 +407,7 @@
     NSInteger row = [outlineView clickedRow];
     SKBookmark *bm = row == -1 ? nil : [outlineView itemAtRow:row];
     if (bm && [bm bookmarkType] == SKBookmarkTypeBookmark)
-        [self openBookmarks:[NSArray arrayWithObject:bm]];
+        [self openBookmark:bm];
 }
 
 - (IBAction)insertBookmarkFolder:(id)sender {


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

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to