Revision: 6590
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6590&view=rev
Author:   hofman
Date:     2010-06-18 09:48:22 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Use KVC to get setups for bookmark. Remove unused method.

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

Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h        2010-06-15 12:31:57 UTC (rev 6589)
+++ trunk/SKBookmarkController.h        2010-06-18 09:48:22 UTC (rev 6590)
@@ -62,7 +62,6 @@
 
 - (void)addBookmarkForPath:(NSString *)path pageIndex:(NSUInteger)pageIndex 
label:(NSString *)label toFolder:(SKBookmark *)folder;
 - (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)openBookmark:(SKBookmark *)bookmark;

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2010-06-15 12:31:57 UTC (rev 6589)
+++ trunk/SKBookmarkController.m        2010-06-18 09:48:22 UTC (rev 6590)
@@ -223,22 +223,6 @@
         [folder insertObject:bookmark inChildrenAtIndex:[folder 
countOfChildren]];
 }
 
-- (void)addBookmarkForPaths:(NSArray *)paths pageIndexes:(NSArray 
*)pageIndexes label:(NSString *)label toFolder:(SKBookmark *)folder {
-    NSEnumerator *pathEnum = [paths objectEnumerator];
-    NSEnumerator *pageEnum = [pageIndexes objectEnumerator];
-    NSString *path;
-    NSNumber *page;
-    NSMutableArray *children = [NSMutableArray array];
-    SKBookmark *bookmark;
-    while ((path = [pathEnum nextObject]) && (page = [pageEnum nextObject])) {
-        if (bookmark = [SKBookmark bookmarkWithPath:path pageIndex:[page 
unsignedIntegerValue] label:[path lastPathComponent]])
-            [children addObject:bookmark];
-    }
-    if (folder == nil) folder = bookmarkRoot;
-    if (bookmark = [SKBookmark bookmarkSessionWithChildren:children 
label:label])
-        [folder insertObject:bookmark inChildrenAtIndex:[folder 
countOfChildren]];
-}
-
 - (void)addBookmarkForSetups:(NSArray *)setupDicts label:(NSString *)label 
toFolder:(SKBookmark *)folder {
     NSMutableArray *children = [NSMutableArray array];
     SKBookmark *bookmark;

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2010-06-15 12:31:57 UTC (rev 
6589)
+++ trunk/SKMainWindowController_Actions.m      2010-06-18 09:48:22 UTC (rev 
6590)
@@ -839,10 +839,8 @@
 - (void)sessionBookmarkSheetDidEnd:(SKBookmarkSheetController *)controller 
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
     if (returnCode == NSAlertDefaultReturn) {
         SKBookmarkController *bmController = [SKBookmarkController 
sharedBookmarkController];
+        NSArray *setups = [[NSApp orderedDocuments] 
valueForKey:@"currentDocumentSetup"];
         NSString *label = [controller stringValue];
-        NSMutableArray *setups = [NSMutableArray array];
-        for (id document in [NSApp orderedDocuments])
-            [setups addObject:[document currentDocumentSetup]];
         [bmController addBookmarkForSetups:setups label:label 
toFolder:[controller selectedFolder]];
     }
 }


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

Reply via email to