Revision: 27570
http://sourceforge.net/p/bibdesk/svn/27570
Author: hofman
Date: 2022-06-06 16:20:34 +0000 (Mon, 06 Jun 2022)
Log Message:
-----------
no separate method to get download for linked file
Modified Paths:
--------------
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2022-06-06 16:14:03 UTC (rev 27569)
+++ trunk/bibdesk/BibItem.m 2022-06-06 16:20:34 UTC (rev 27570)
@@ -116,7 +116,6 @@
- (void)createFilesArray;
-- (BDSKItemDownload *)downloadForLinkedFile:(BDSKLinkedFile *)linkedFile;
- (void)updateDownloadIndexes;
@end
@@ -2760,12 +2759,13 @@
for (BDSKLinkedFile *file in oldFiles) {
[self removeFileToBeFiled:file];
- BDSKItemDownload *download = [self downloadForLinkedFile:file];
- if (download) {
- [download cancel];
- NSDictionary *userInfo = [NSDictionary
dictionaryWithObject:download forKey:BDSKItemDownloadKey];
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKItemDownloadFinishedNotification object:self
userInfo:userInfo];
- [downloads removeObject:download];
+ for (BDSKItemDownload *download in [[downloads copy] autorelease]) {
+ if ([download linkedFile] == file) {
+ [download cancel];
+ NSDictionary *userInfo = [NSDictionary
dictionaryWithObject:download forKey:BDSKItemDownloadKey];
+ [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKItemDownloadFinishedNotification object:self
userInfo:userInfo];
+ [downloads removeObject:download];
+ }
}
}
@@ -2785,12 +2785,14 @@
[self removeFileToBeFiled:file];
- BDSKItemDownload *download = [self downloadForLinkedFile:file];
- if (download) {
- [download cancel];
- NSDictionary *userInfo = [NSDictionary dictionaryWithObject:download
forKey:BDSKItemDownloadKey];
- [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKItemDownloadFinishedNotification object:self
userInfo:userInfo];
- [downloads removeObject:download];
+ for (BDSKItemDownload *download in downloads) {
+ if ([download linkedFile] == file) {
+ [download cancel];
+ NSDictionary *userInfo = [NSDictionary
dictionaryWithObject:download forKey:BDSKItemDownloadKey];
+ [[NSNotificationCenter defaultCenter]
postNotificationName:BDSKItemDownloadFinishedNotification object:self
userInfo:userInfo];
+ [downloads removeObject:download];
+ break;
+ }
}
[files replaceObjectAtIndex:idx withObject:file];
@@ -4225,14 +4227,6 @@
[unresolvedURLs release];
}
-- (BDSKItemDownload *)downloadForLinkedFile:(BDSKLinkedFile *)linkedFile {
- for (BDSKItemDownload *download in downloads) {
- if ([download linkedFile] == linkedFile)
- return download;
- }
- return nil;
-}
-
- (void)updateDownloadIndexes {
for (BDSKItemDownload *download in downloads) {
NSUInteger idx = [download index];
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
