[Bibdesk-commit] SF.net SVN: bibdesk:[27631] trunk/bibdesk/BDSKLinkedFile.m

[hofman--- via Bibdesk-commit]

Revision: 27631
          http://sourceforge.net/p/bibdesk/svn/27631
Author:   hofman
Date:     2022-06-15 09:37:40 +0000 (Wed, 15 Jun 2022)
Log Message:
-----------
Override both data getter methods in BDSKAliasLinkedFile,so tyhe pair of metods 
is implemented side by side as they are used

Modified Paths:
--------------
    trunk/bibdesk/BDSKLinkedFile.m

Modified: trunk/bibdesk/BDSKLinkedFile.m
===================================================================
--- trunk/bibdesk/BDSKLinkedFile.m      2022-06-15 06:30:17 UTC (rev 27630)
+++ trunk/bibdesk/BDSKLinkedFile.m      2022-06-15 09:37:40 UTC (rev 27631)
@@ -514,6 +514,7 @@
     return hasSkimNotes;
 }
 
+// this is overridden by BDSKAliasLinkedFile
 - (NSData *)copyAliasDataRelativeToPath:(NSString *)basePath {
     BDSKAlias *anAlias = NULL;
     NSData *data = nil;
@@ -534,13 +535,24 @@
     return data;
 }
 
+// this is overridden by BDSKAliasLinkedFile
 - (NSData *)copyDataRelativeToPath:(NSString *)newBasePath isBookmark:(BOOL 
*)isBookmark {
-    NSData *data = [self copyAliasDataRelativeToPath:newBasePath];
+    NSData *data = nil;
+    
+    if (fileURL) {
+        data = BDSKCreateBookmarkDataFromURL(fileURL);
+    } else if (relativePath && newBasePath) {
+        NSURL *aURL = [NSURL fileURLWithPath:[relativePath isAbsolutePath] ? 
relativePath : [[newBasePath stringByAppendingPathComponent:relativePath] 
stringByStandardizingPath]];
+        data = BDSKCreateBookmarkDataFromURL(aURL);
+    }
+    if (data == nil && [alias isKindOfClass:[NSData class]])
+        data = [alias copy];
+    
     if (data) {
+        *isBookmark = YES;
+    } else if ([alias isKindOfClass:[BDSKAlias class]]) {
+        data = [alias copyData];
         *isBookmark = NO;
-    } else if ([alias isKindOfClass:[NSData class]]) {
-        data = [alias retain];
-        *isBookmark = YES;
     }
     return data;
 }
@@ -830,6 +842,17 @@
     return data;
 }
 
+- (NSData *)copyDataRelativeToPath:(NSString *)newBasePath isBookmark:(BOOL 
*)isBookmark {
+    NSData *data = [self copyAliasDataRelativeToPath:newBasePath];
+    if (data) {
+        *isBookmark = NO;
+    } else if ([alias isKindOfClass:[NSData class]]) {
+        data = [alias retain];
+        *isBookmark = YES;
+    }
+    return data;
+}
+
 @end
 
 #pragma mark -
@@ -987,27 +1010,6 @@
     isInitial = NO;
 }
 
-- (NSData *)copyDataRelativeToPath:(NSString *)newBasePath isBookmark:(BOOL 
*)isBookmark {
-    NSData *data = nil;
-    
-    if (fileURL) {
-        data = BDSKCreateBookmarkDataFromURL(fileURL);
-    } else if (relativePath && newBasePath) {
-        NSURL *aURL = [NSURL fileURLWithPath:[relativePath isAbsolutePath] ? 
relativePath : [[newBasePath stringByAppendingPathComponent:relativePath] 
stringByStandardizingPath]];
-        data = BDSKCreateBookmarkDataFromURL(aURL);
-    }
-    if (data == nil && [alias isKindOfClass:[NSData class]])
-        data = [alias copy];
-    
-    if (data) {
-        *isBookmark = YES;
-    } else if ([alias isKindOfClass:[BDSKAlias class]]) {
-        data = [alias copyData];
-        *isBookmark = NO;
-    }
-    return data;
-}
-
 @end
 
 #pragma mark -

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit