Revision: 6789
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6789&view=rev
Author:   hofman
Date:     2010-09-09 13:07:48 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
create BDAlias for bookmarks in internal initializers, use different 
initializers for path and alias data.

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

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2010-09-09 10:23:16 UTC (rev 6788)
+++ trunk/SKBookmark.m  2010-09-09 13:07:48 UTC (rev 6789)
@@ -65,7 +65,7 @@
     NSUInteger pageIndex;
     NSDictionary *setup;
 }
-- (id)initWithAlias:(BDAlias *)anAlias pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel;
+- (id)initWithAliasData:(NSData *)aData pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel;
 - (BDAlias *)alias;
 - (NSData *)aliasData;
 @end
@@ -329,7 +329,7 @@
 }
 
 - (id)initWithPath:(NSString *)aPath pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel {
-    return [[SKFileBookmark alloc] initWithAlias:[BDAlias aliasWithPath:aPath] 
pageIndex:aPageIndex label:aLabel];
+    return [[SKFileBookmark alloc] initWithPath:aPath pageIndex:aPageIndex 
label:aLabel];
 }
 
 - (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
@@ -369,9 +369,8 @@
     } else if ([dictionary objectForKey:@"windowFrame"]) {
         return [[SKFileBookmark alloc] initWithSetup:dictionary 
label:[dictionary objectForKey:LABEL_KEY]];
     } else {
-        BDAlias *alias = [BDAlias aliasWithData:[dictionary 
objectForKey:ALIASDATA_KEY]];
         NSNumber *pageIndex = [dictionary objectForKey:PAGEINDEX_KEY];
-        return [[SKFileBookmark alloc] initWithAlias:alias 
pageIndex:(pageIndex ? [pageIndex unsignedIntegerValue] : NSNotFound) 
label:[dictionary objectForKey:LABEL_KEY]];
+        return [[SKFileBookmark alloc] initWithAliasData:[dictionary 
objectForKey:ALIASDATA_KEY] pageIndex:(pageIndex ? [pageIndex 
unsignedIntegerValue] : NSNotFound) label:[dictionary objectForKey:LABEL_KEY]];
     }
 }
 
@@ -410,10 +409,10 @@
     return image;
 }
 
-- (id)initWithAlias:(BDAlias *)anAlias pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel {
+- (id)initWithPath:(NSString *)aPath pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel {
     if (self = [super init]) {
-        if (anAlias) {
-            alias = [anAlias retain];
+        alias = [[BDAlias alloc] initWithPath:aPath];
+        if (alias) {
             aliasData = [[alias aliasData] retain];
             pageIndex = aPageIndex;
             label = [aLabel copy];
@@ -426,9 +425,25 @@
     return self;
 }
 
+- (id)initWithAliasData:(NSData *)aData pageIndex:(NSUInteger)aPageIndex 
label:(NSString *)aLabel {
+    if (self = [super init]) {
+        alias = [[BDAlias alloc] initWithData:aData];
+        if (aData && alias) {
+            aliasData = [aData retain];
+            pageIndex = aPageIndex;
+            label = [aLabel copy];
+            setup = nil;
+        } else {
+            [self release];
+            self = nil;
+        }
+    }
+    return self;
+}
+
 - (id)initWithSetup:(NSDictionary *)aSetupDict label:(NSString *)aLabel {
     NSNumber *pageIndexNumber = [aSetupDict objectForKey:PAGEINDEX_KEY];
-    if (self = [self initWithAlias:[BDAlias aliasWithData:[aSetupDict 
objectForKey:ALIASDATA_KEY]] pageIndex:(pageIndexNumber ? [pageIndexNumber 
unsignedIntegerValue] : NSNotFound) label:aLabel]) {
+    if (self = [self initWithAliasData:[aSetupDict objectForKey:ALIASDATA_KEY] 
pageIndex:(pageIndexNumber ? [pageIndexNumber unsignedIntegerValue] : 
NSNotFound) label:aLabel]) {
         setup = [aSetupDict copy];
     }
     return self;


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