Revision: 28387
http://sourceforge.net/p/bibdesk/svn/28387
Author: hofman
Date: 2023-10-03 09:44:31 +0000 (Tue, 03 Oct 2023)
Log Message:
-----------
Rename variable. Get integerValue of number.
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2023-10-02 21:49:21 UTC (rev 28386)
+++ trunk/bibdesk/BDSKFiler.m 2023-10-03 09:44:31 UTC (rev 28387)
@@ -196,7 +196,7 @@
id paperInfo = [paperInfos objectAtIndex:i];
BDSKLinkedFile *file = [paperInfo valueForKey:BDSKFilerFileKey];
BibItem *pub = [paperInfo valueForKey:BDSKFilerPublicationKey];
- BDSKFilerError flag = force ? [paperInfo
valueForKey:BDSKFilerFlagKey] : BDSKNoError;
+ BDSKFilerError ignoredError = force ? [[paperInfo
valueForKey:BDSKFilerFlagKey] integerValue] : BDSKNoError;
NSString *oldPath = nil;
NSString *newPath = nil;
@@ -233,15 +233,15 @@
if (check && NO == (isLinkedFiles ? [pub
canSetURLForLinkedFile:file] : [pub canSetURLForField:field])) {
[info setValue:NSLocalizedString(@"Incomplete information
to generate file name.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:flag |
BDSKIncompleteFieldsErrorMask] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKIncompleteFieldsErrorMask] forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move anyway.",@"")
forKey:BDSKFilerFixKey];
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[errorInfoDicts addObject:info];
- } else if ([[newPath lastPathComponent] length] > 255 && (flag
& BDSKFileNameTooLongErrorMask) == 0) {
+ } else if ([[newPath lastPathComponent] length] > 255 &&
(ignoredError & BDSKFileNameTooLongErrorMask) == 0) {
[info setValue:NSLocalizedString(@"The file name is too
long.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:flag |
BDSKFileNameTooLongErrorMask] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKFileNameTooLongErrorMask] forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move anyway.",@"")
forKey:BDSKFilerFixKey];
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[errorInfoDicts addObject:info];
@@ -262,20 +262,20 @@
NSError *error = nil;
- if (cancelled && (flag & BDSKCancelledErrorMask) == 0)
{
+ if (cancelled && (ignoredError &
BDSKCancelledErrorMask) == 0) {
[info setValue:NSLocalizedString(@"The move was
cancelled.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:flag |
BDSKCancelledErrorMask] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber
numberWithInteger:ignoredError | BDSKCancelledErrorMask]
forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move
anyway.",@"") forKey:BDSKFilerFixKey];
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[errorInfoDicts addObject:info];
- } else if (NO == [[NSFileManager defaultManager]
moveItemAtURL:[NSURL fileURLWithPath:oldPath isDirectory:NO] toURL:[NSURL
fileURLWithPath:newPath isDirectory:NO] ignoring:flag error:&error]){
+ } else if (NO == [[NSFileManager defaultManager]
moveItemAtURL:[NSURL fileURLWithPath:oldPath isDirectory:NO] toURL:[NSURL
fileURLWithPath:newPath isDirectory:NO] ignoring:ignoredError error:&error]){
NSDictionary *errorInfo = [error userInfo];
[info setValue:[errorInfo
objectForKey:NSLocalizedRecoverySuggestionErrorKey] forKey:BDSKFilerFixKey];
[info setValue:[errorInfo
objectForKey:NSLocalizedDescriptionKey] forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:flag |
[error code]] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber
numberWithInteger:ignoredError | [error code]] forKey:BDSKFilerFlagKey];
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[errorInfoDicts addObject:info];
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
