Revision: 4256
http://skim-app.svn.sourceforge.net/skim-app/?rev=4256&view=rev
Author: hofman
Date: 2008-07-19 12:47:57 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Simplify API for bookmarks
Modified Paths:
--------------
trunk/SKBookmark.h
trunk/SKBookmark.m
Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h 2008-07-19 12:37:25 UTC (rev 4255)
+++ trunk/SKBookmark.h 2008-07-19 12:47:57 UTC (rev 4256)
@@ -47,15 +47,11 @@
SKBookmarkTypeSeparator
};
[EMAIL PROTECTED] BDAlias;
-
@interface SKBookmark : NSObject <NSCopying> {
SKBookmark *parent;
NSUndoManager *undoManager;
}
-- (id)initWithAlias:(BDAlias *)anAlias pageIndex:(unsigned)aPageIndex
label:(NSString *)aLabel;
-- (id)initWithAliasData:(NSData *)aData pageIndex:(unsigned)aPageIndex
label:(NSString *)aLabel;
- (id)initWithPath:(NSString *)aPath pageIndex:(unsigned)aPageIndex
label:(NSString *)aLabel;
- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel;
- (id)initFolderWithLabel:(NSString *)aLabel;
@@ -72,8 +68,6 @@
- (NSImage *)icon;
- (NSString *)path;
-- (BDAlias *)alias;
-- (NSData *)aliasData;
- (unsigned int)pageIndex;
- (NSNumber *)pageNumber;
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2008-07-19 12:37:25 UTC (rev 4255)
+++ trunk/SKBookmark.m 2008-07-19 12:47:57 UTC (rev 4256)
@@ -62,6 +62,8 @@
NSString *label;
unsigned int pageIndex;
}
+- (BDAlias *)alias;
+- (NSData *)aliasData;
@end
@interface SKFolderBookmark : SKBookmark {
@@ -100,10 +102,6 @@
return [[SKFileBookmark alloc] initWithAlias:anAlias pageIndex:aPageIndex
label:aLabel];
}
-- (id)initWithAliasData:(NSData *)aData pageIndex:(unsigned)aPageIndex
label:(NSString *)aLabel {
- return [self initWithAlias:[BDAlias aliasWithData:aData]
pageIndex:aPageIndex label:aLabel];
-}
-
- (id)initWithPath:(NSString *)aPath pageIndex:(unsigned)aPageIndex
label:(NSString *)aLabel {
return [self initWithAlias:[BDAlias aliasWithPath:aPath]
pageIndex:aPageIndex label:aLabel];
}
@@ -135,7 +133,7 @@
} else if ([[dictionary objectForKey:SKBookmarkTypeKey]
isEqualToString:SKBookmarkTypeSeparatorString]) {
return [self initSeparator];
} else {
- return [self initWithAliasData:[dictionary
objectForKey:SKBookmarkAliasDataKey] pageIndex:[[dictionary
objectForKey:SKBookmarkPageIndexKey] unsignedIntValue] label:[dictionary
objectForKey:SKBookmarkLabelKey]];
+ return [self initWithAlias:[BDAlias aliasWithData:[dictionary
objectForKey:SKBookmarkAliasDataKey]] pageIndex:[[dictionary
objectForKey:SKBookmarkPageIndexKey] unsignedIntValue] label:[dictionary
objectForKey:SKBookmarkLabelKey]];
}
}
@@ -160,8 +158,6 @@
- (void)setLabel:(NSString *)newLabel {}
- (NSString *)path { return nil; }
-- (BDAlias *)alias { return nil; }
-- (NSData *)aliasData { return nil; }
- (unsigned int)pageIndex { return NSNotFound; }
- (NSNumber *)pageNumber { return nil; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
