Revision: 27571
http://sourceforge.net/p/bibdesk/svn/27571
Author: hofman
Date: 2022-06-06 16:39:36 +0000 (Mon, 06 Jun 2022)
Log Message:
-----------
Pass single URL and index to replacement delegate method, we never use it for
multiple URLs
Modified Paths:
--------------
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2022-06-06 16:20:34 UTC (rev 27570)
+++ trunk/bibdesk/BDSKEditor.m 2022-06-06 16:39:36 UTC (rev 27571)
@@ -1764,24 +1764,19 @@
return YES;
}
-- (BOOL)fileView:(FVFileView *)fileView replaceURLsAtIndexes:(NSIndexSet
*)aSet withURLs:(NSArray *)newURLs forDrop:(id <NSDraggingInfo>)info
dropOperation:(FVDropOperation)operation;
+- (BOOL)fileView:(FVFileView *)fileView replaceURLAtIndex:(NSUInteger)anIndex
withURL:(NSURL *)newURL forDrop:(id <NSDraggingInfo>)info
dropOperation:(FVDropOperation)operation;
{
- NSEnumerator *enumerator = [newURLs objectEnumerator];
-
- [aSet enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop){
- NSURL *aURL = [enumerator nextObject];
- BDSKLinkedFile *aFile = nil;
- if (aURL && (aFile = [BDSKLinkedFile linkedFileWithURL:aURL
delegate:publication])) {
- NSURL *oldURL = [[[publication objectInFilesAtIndex:idx] URL]
retain];
- [publication replaceObjectInFilesAtIndex:idx withObject:aFile];
- if (oldURL)
- [[self document] userRemovedURL:oldURL
forPublication:publication];
- [oldURL release];
- [[self document] userAddedURL:aURL forPublication:publication];
- if (([NSEvent standardModifierFlags] & NSCommandKeyMask) == 0 &&
[aFile isFile])
- [publication autoFileLinkedFile:aFile];
- }
- }];
+ BDSKLinkedFile *aFile = [BDSKLinkedFile linkedFileWithURL:newURL
delegate:publication];
+ if (aFile == nil)
+ return NO;
+ NSURL *oldURL = [[[publication objectInFilesAtIndex:anIndex] URL] retain];
+ [publication replaceObjectInFilesAtIndex:anIndex withObject:aFile];
+ if (oldURL)
+ [[self document] userRemovedURL:oldURL forPublication:publication];
+ [oldURL release];
+ [[self document] userAddedURL:newURL forPublication:publication];
+ if (([NSEvent standardModifierFlags] & NSCommandKeyMask) == 0 && [aFile
isFile])
+ [publication autoFileLinkedFile:aFile];
return YES;
}
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2022-06-06 16:20:34 UTC (rev
27570)
+++ trunk/bibdesk/BibDocument_DataSource.m 2022-06-06 16:39:36 UTC (rev
27571)
@@ -1570,27 +1570,25 @@
return NO;
}
-- (BOOL)fileView:(FVFileView *)aFileView replaceURLsAtIndexes:(NSIndexSet
*)aSet withURLs:(NSArray *)newURLs forDrop:(id <NSDraggingInfo>)info
dropOperation:(FVDropOperation)operation {
+- (BOOL)fileView:(FVFileView *)aFileView replaceURLAtIndex:(NSUInteger)anIndex
withURL:(NSURL *)newURL forDrop:(id <NSDraggingInfo>)info
dropOperation:(FVDropOperation)operation {
BibItem *publication = [self singleSelectedPublication];
if (publication == nil)
return NO;
- NSEnumerator *enumerator = [newURLs objectEnumerator];
+ BDSKLinkedFile *aFile = [BDSKLinkedFile linkedFileWithURL:newURL
delegate:publication];
+ if (aFile == nil)
+ return NO;
- [aSet enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop){
- NSURL *aURL = [enumerator nextObject];
- BDSKLinkedFile *aFile;
- if (aURL && (aFile = [BDSKLinkedFile linkedFileWithURL:aURL
delegate:publication])) {
- NSURL *oldURL = [[[publication objectInFilesAtIndex:idx] URL]
retain];
- [publication replaceObjectInFilesAtIndex:idx withObject:aFile];
- if (oldURL)
- [self userRemovedURL:oldURL forPublication:publication];
- [oldURL release];
- [self userAddedURL:aURL forPublication:publication];
- if (([NSEvent standardModifierFlags] & NSCommandKeyMask) == 0)
- [publication autoFileLinkedFile:aFile];
- }
- }];
+ NSURL *oldURL = [[[publication objectInFilesAtIndex:anIndex] URL] retain];
+
+ [publication replaceObjectInFilesAtIndex:anIndex withObject:aFile];
+ if (oldURL)
+ [self userRemovedURL:oldURL forPublication:publication];
+ [oldURL release];
+ [self userAddedURL:newURL forPublication:publication];
+ if (([NSEvent standardModifierFlags] & NSCommandKeyMask) == 0)
+ [publication autoFileLinkedFile:aFile];
+
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
