Revision: 6784
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6784&view=rev
Author:   hofman
Date:     2010-09-08 11:09:47 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
return array from entire contents scripting property only for folder bookmarks

Modified Paths:
--------------
    trunk/SKBookmark.m

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2010-09-07 20:40:14 UTC (rev 6783)
+++ trunk/SKBookmark.m  2010-09-08 11:09:47 UTC (rev 6784)
@@ -226,14 +226,7 @@
     return [parent parent] == nil ? nil : parent;
 };
 
-- (NSArray *)entireContents {
-    NSMutableArray *contents = [NSMutableArray array];
-    for (SKBookmark *bookmark in [self children]) {
-        [contents addObject:bookmark];
-        [contents addObjectsFromArray:[bookmark entireContents]];
-    }
-    return contents;
-}
+- (NSArray *)entireContents { return nil; }
 
 - (NSArray *)bookmarks {
     return [self children];
@@ -253,7 +246,7 @@
 
 - (id)newScriptingObjectOfClass:(Class)objectClass forValueForKey:(NSString 
*)key withContentsValue:(id)contentsValue properties:(NSDictionary *)properties 
{
     if ([key isEqualToString:@"bookmarks"]) {
-        SKBookmark *bookmark = nil;
+        SKBookmark *bookmark = nil;NSLog(@"%@ %@",[contentsValue 
class],contentsValue);
         FourCharCode type = [[properties 
objectForKey:@"scriptingBookmarkType"] unsignedIntValue];
         if (type == 0) {
             if (contentsValue || [properties objectForKey:@"scriptingFile"])
@@ -579,6 +572,15 @@
     return SKScriptingBookmarkTypeFolder;
 }
 
+- (NSArray *)entireContents {
+    NSMutableArray *contents = [NSMutableArray array];
+    for (SKBookmark *bookmark in [self children]) {
+        [contents addObject:bookmark];
+        [contents addObjectsFromArray:[bookmark entireContents]];
+    }
+    return contents;
+}
+
 @end
 
 #pragma mark -


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