Revision: 7534 http://skim-app.svn.sourceforge.net/skim-app/?rev=7534&view=rev Author: hofman Date: 2011-11-11 17:53:13 +0000 (Fri, 11 Nov 2011) Log Message: ----------- use property
Modified Paths: -------------- trunk/SKBookmarkController.m Modified: trunk/SKBookmarkController.m =================================================================== --- trunk/SKBookmarkController.m 2011-11-09 11:29:38 UTC (rev 7533) +++ trunk/SKBookmarkController.m 2011-11-11 17:53:13 UTC (rev 7534) @@ -86,9 +86,13 @@ - (void)stopObservingBookmarks:(NSArray *)oldBookmarks; @end +@interface SKBookmarkController () +@property (nonatomic, retain) NSArray *draggedBookmarks; +@end + @implementation SKBookmarkController -@synthesize outlineView, statusBar, bookmarkRoot, recentDocuments, undoManager; +@synthesize outlineView, statusBar, bookmarkRoot, recentDocuments, undoManager, draggedBookmarks; static SKBookmarkController *sharedBookmarkController = nil; @@ -207,32 +211,6 @@ [statusBar setLeftStringValue:message ?: @""]; } -#pragma mark Bookmarks - -static NSArray *minimumCoverForBookmarks(NSArray *items) { - SKBookmark *lastBm = nil; - NSMutableArray *minimalCover = [NSMutableArray array]; - - for (SKBookmark *bm in items) { - if ([bm isDescendantOf:lastBm] == NO) { - [minimalCover addObject:bm]; - lastBm = bm; - } - } - return minimalCover; -} - -- (NSArray *)draggedBookmarks { - return draggedBookmarks; -} - -- (void)setDraggedBookmarks:(NSArray *)items { - if (draggedBookmarks != items) { - [draggedBookmarks release]; - draggedBookmarks = [items retain]; - } -} - #pragma mark Recent Documents - (NSDictionary *)recentDocumentInfoAtPath:(NSString *)path { @@ -570,6 +548,19 @@ #pragma mark NSOutlineView datasource methods +static NSArray *minimumCoverForBookmarks(NSArray *items) { + SKBookmark *lastBm = nil; + NSMutableArray *minimalCover = [NSMutableArray array]; + + for (SKBookmark *bm in items) { + if ([bm isDescendantOf:lastBm] == NO) { + [minimalCover addObject:bm]; + lastBm = bm; + } + } + return minimalCover; +} + - (NSInteger)outlineView:(NSOutlineView *)ov numberOfChildrenOfItem:(id)item { if (item == nil) item = bookmarkRoot; return [item bookmarkType] == SKBookmarkTypeFolder ? [item countOfChildren] : 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit