Revision: 28394
http://sourceforge.net/p/bibdesk/svn/28394
Author: hofman
Date: 2023-10-05 16:38:42 +0000 (Thu, 05 Oct 2023)
Log Message:
-----------
rename enum values
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.h
trunk/bibdesk/BDSKFiler.m
trunk/bibdesk/BDSKFilerErrorController.m
trunk/bibdesk/BDSKPathColorTransformer.m
Modified: trunk/bibdesk/BDSKFiler.h
===================================================================
--- trunk/bibdesk/BDSKFiler.h 2023-10-05 16:28:28 UTC (rev 28393)
+++ trunk/bibdesk/BDSKFiler.h 2023-10-05 16:38:42 UTC (rev 28394)
@@ -49,16 +49,16 @@
@class BibDocument;
typedef NS_OPTIONS(NSInteger, BDSKFilerError) {
- BDSKNoError = 0,
- BDSKSourceFileDoesNotExistErrorMask = 1 << 0,
- BDSKTargetFileExistsErrorMask = 1 << 1,
- BDSKCannotMoveFileErrorMask = 1 << 2,
- BDSKCannotRemoveFileErrorMask = 1 << 3,
- BDSKCannotResolveAliasErrorMask = 1 << 4,
- BDSKCannotCreateParentErrorMask = 1 << 5,
- BDSKIncompleteFieldsErrorMask = 1 << 6,
- BDSKFileNameTooLongErrorMask = 1 << 7,
- BDSKCancelledErrorMask = 1 << 8
+ BDSKFilerErrorNone = 0,
+ BDSKFilerErrorSourceFileDoesNotExist = 1 << 0,
+ BDSKFilerErrorTargetFileExists = 1 << 1,
+ BDSKFilerErrorCannotMoveFile = 1 << 2,
+ BDSKFilerErrorCannotRemoveFile = 1 << 3,
+ BDSKFilerErrorCannotResolveAlias = 1 << 4,
+ BDSKFilerErrorCannotCreateParent = 1 << 5,
+ BDSKFilerErrorIncompleteFields = 1 << 6,
+ BDSKFilerErrorFileNameTooLong = 1 << 7,
+ BDSKFilerErrorCancelled = 1 << 8
};
typedef NS_OPTIONS(NSUInteger, BDSKFilerOptions) {
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2023-10-05 16:28:28 UTC (rev 28393)
+++ trunk/bibdesk/BDSKFiler.m 2023-10-05 16:38:42 UTC (rev 28394)
@@ -196,7 +196,7 @@
id paperInfo = [paperInfos objectAtIndex:i];
BDSKLinkedFile *file = [paperInfo valueForKey:BDSKFilerFileKey];
BibItem *pub = [paperInfo valueForKey:BDSKFilerPublicationKey];
- BDSKFilerError ignoredError = force ? [[paperInfo
valueForKey:BDSKFilerFlagKey] integerValue] : BDSKNoError;
+ BDSKFilerError ignoredError = force ? [[paperInfo
valueForKey:BDSKFilerFlagKey] integerValue] : BDSKFilerErrorNone;
NSString *oldPath = nil;
NSString *newPath = nil;
@@ -231,17 +231,17 @@
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[info setValue:pub forKey:BDSKFilerPublicationKey];
- if (check && (ignoredError & BDSKIncompleteFieldsErrorMask) ==
0 && NO == (isLinkedFiles ? [pub canSetURLForLinkedFile:file] : [pub
canSetURLForField:field])) {
+ if (check && (ignoredError & BDSKFilerErrorIncompleteFields)
== 0 && NO == (isLinkedFiles ? [pub canSetURLForLinkedFile:file] : [pub
canSetURLForField:field])) {
[info setValue:NSLocalizedString(@"Incomplete information
to generate file name.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKIncompleteFieldsErrorMask] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKFilerErrorIncompleteFields] forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move anyway.",@"")
forKey:BDSKFilerFixKey];
[errorInfoDicts addObject:info];
- } else if ([[newPath lastPathComponent] length] > 255 &&
(ignoredError & BDSKFileNameTooLongErrorMask) == 0) {
+ } else if ([[newPath lastPathComponent] length] > 255 &&
(ignoredError & BDSKFilerErrorFileNameTooLong) == 0) {
[info setValue:NSLocalizedString(@"The file name is too
long.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKFileNameTooLongErrorMask] forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber numberWithInteger:ignoredError |
BDSKFilerErrorFileNameTooLong] forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move anyway.",@"")
forKey:BDSKFilerFixKey];
[errorInfoDicts addObject:info];
@@ -261,10 +261,10 @@
NSDictionary *errorInfo = nil;
- if (cancelled && (ignoredError &
BDSKCancelledErrorMask) == 0) {
+ if (cancelled && (ignoredError &
BDSKFilerErrorCancelled) == 0) {
[info setValue:NSLocalizedString(@"The move was
cancelled.",@"") forKey:BDSKFilerStatusKey];
- [info setValue:[NSNumber
numberWithInteger:ignoredError | BDSKCancelledErrorMask]
forKey:BDSKFilerFlagKey];
+ [info setValue:[NSNumber
numberWithInteger:ignoredError | BDSKFilerErrorCancelled]
forKey:BDSKFilerFlagKey];
[info setValue:NSLocalizedString(@"Move
anyway.",@"") forKey:BDSKFilerFixKey];
[errorInfoDicts addObject:info];
@@ -353,7 +353,7 @@
NSURL *resolvedNewURL = nil;
NSString *status = nil;
NSString *fix = nil;
- BDSKFilerError statusFlag = BDSKNoError;
+ BDSKFilerError statusFlag = BDSKFilerErrorNone;
BOOL ignoreMove = NO;
// filemanager needs aliases resolved for moving and existence checks
@@ -365,16 +365,16 @@
URLByAppendingPathComponent:[fileURL lastPathComponent]
isDirectory:NO];
if (resolvedNewURL == nil || resolvedURL == nil) {
status = NSLocalizedString(@"Unable to resolve aliases in path.",
@"AutoFile error message");
- statusFlag = BDSKCannotResolveAliasErrorMask;
+ statusFlag = BDSKFilerErrorCannotResolveAlias;
}else if([resolvedNewURL checkResourceIsReachableAndReturnError:NULL]){
if([resolvedURL checkResourceIsReachableAndReturnError:NULL]){
- if((ignoredError & BDSKTargetFileExistsErrorMask) != 0){
+ if((ignoredError & BDSKFilerErrorTargetFileExists) != 0){
NSURL *backupURL = [fm
desktopFileURLWithBasename:[resolvedNewURL lastPathComponent]];
- if(NO == [self moveItemAtURL:resolvedNewURL toURL:backupURL
ignoring:BDSKNoError errorInfo:NULL] &&
+ if(NO == [self moveItemAtURL:resolvedNewURL toURL:backupURL
ignoring:BDSKFilerErrorNone errorInfo:NULL] &&
[resolvedNewURL
checkResourceIsReachableAndReturnError:NULL] &&
![fm removeItemAtURL:resolvedNewURL error:NULL]){
status = NSLocalizedString(@"Unable to remove existing
file at target location.", @"AutoFile error message");
- statusFlag = BDSKTargetFileExistsErrorMask |
BDSKCannotRemoveFileErrorMask;
+ statusFlag = BDSKFilerErrorTargetFileExists |
BDSKFilerErrorCannotRemoveFile;
// cleanup: move back backup
if(![fm moveItemAtURL:backupURL toURL:resolvedNewURL
error:NULL] && [resolvedNewURL checkResourceIsReachableAndReturnError:NULL]){
[fm removeItemAtURL:backupURL error:NULL];
@@ -387,31 +387,31 @@
}else{
status = NSLocalizedString(@"Undeletable file exists at
target location.", @"AutoFile error message");
}
- statusFlag = BDSKTargetFileExistsErrorMask;
+ statusFlag = BDSKFilerErrorTargetFileExists;
}
- }else if((ignoredError & BDSKSourceFileDoesNotExistErrorMask) != 0){
+ }else if((ignoredError & BDSKFilerErrorSourceFileDoesNotExist) != 0){
ignoreMove = YES;
}else{
status = NSLocalizedString(@"Original file does not exist, file
exists at target location.", @"AutoFile error message");
fix = NSLocalizedString(@"Use existing file at target location.",
@"AutoFile fix");
- statusFlag = BDSKSourceFileDoesNotExistErrorMask |
BDSKTargetFileExistsErrorMask;
+ statusFlag = BDSKFilerErrorSourceFileDoesNotExist |
BDSKFilerErrorTargetFileExists;
}
}else if(NO == [resolvedURL checkResourceIsReachableAndReturnError:NULL]){
status = NSLocalizedString(@"Original file does not exist.",
@"AutoFile error message");
- statusFlag = BDSKSourceFileDoesNotExistErrorMask;
- }else if((ignoredError & BDSKCannotMoveFileErrorMask) == 0 && NO == [fm
isDeletableFileAtPath:[resolvedURL path]]){
+ statusFlag = BDSKFilerErrorSourceFileDoesNotExist;
+ }else if((ignoredError & BDSKFilerErrorCannotMoveFile) == 0 && NO == [fm
isDeletableFileAtPath:[resolvedURL path]]){
status = NSLocalizedString(@"Unable to move read-only file.",
@"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.", @"AutoFile fix");
- statusFlag = BDSKCannotMoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotMoveFile;
}
- if(statusFlag == BDSKNoError && ignoreMove == NO){
+ if(statusFlag == BDSKFilerErrorNone && ignoreMove == NO){
// create parent directories if necessary (OmniFoundation)
if (NO == [fm createPathToURL:resolvedNewURL attributes:nil]) {
status = NSLocalizedString(@"Unable to create parent directory.",
@"AutoFile error message");
- statusFlag = BDSKCannotCreateParentErrorMask;
+ statusFlag = BDSKFilerErrorCannotCreateParent;
}else{
NSString *fileType = [[fm attributesOfItemAtPath:[resolvedURL
path] error:NULL] fileType];
- if([fileType isEqualToString:NSFileTypeDirectory] && [[NSWorkspace
sharedWorkspace] isFilePackageAtPath:[resolvedURL path]] == NO && ignoredError
!= BDSKCannotMoveFileErrorMask &&
+ if([fileType isEqualToString:NSFileTypeDirectory] && [[NSWorkspace
sharedWorkspace] isFilePackageAtPath:[resolvedURL path]] == NO && ignoredError
!= BDSKFilerErrorCannotMoveFile &&
[[NSUserDefaults standardUserDefaults]
boolForKey:BDSKWarnOnMoveFolderKey]){
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:NSLocalizedString(@"Really Move
Folder?", @"Message in alert dialog when trying to auto file a folder")];
@@ -426,7 +426,7 @@
if(ignoreMove){
status = NSLocalizedString(@"Shouldn't move folder.",
@"AutoFile error message");
fix = NSLocalizedString(@"Move anyway.", @"AutoFile fix");
- statusFlag = BDSKCannotMoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotMoveFile;
}else if([fileType isEqualToString:NSFileTypeSymbolicLink]){
// unfortunately NSFileManager cannot reliably move symlinks...
NSString *pathContent = [fm
destinationOfSymbolicLinkAtPath:[resolvedURL path] error:NULL];
@@ -436,13 +436,13 @@
}
if(![fm createSymbolicLinkAtURL:resolvedNewURL
withDestinationURL:[NSURL fileURLWithPath:pathContent isDirectory:NO]
error:NULL]){
status = NSLocalizedString(@"Unable to move symbolic
link.", @"AutoFile error message");
- statusFlag = BDSKCannotMoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotMoveFile;
}else{
if(![fm removeItemAtURL:resolvedURL error:NULL]){
- if ((ignoredError & BDSKCannotRemoveFileErrorMask) ==
0){
+ if ((ignoredError & BDSKFilerErrorCannotRemoveFile) ==
0){
status = NSLocalizedString(@"Unable to remove
original.", @"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.",
@"AutoFile fix");
- statusFlag = BDSKCannotRemoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotRemoveFile;
//cleanup: remove new file
[fm removeItemAtURL:resolvedNewURL error:NULL];
}
@@ -457,10 +457,10 @@
}
}
}else if([resolvedNewURL
checkResourceIsReachableAndReturnError:NULL]){ // error remove original file
- if((ignoredError & BDSKCannotRemoveFileErrorMask) == 0){
+ if((ignoredError & BDSKFilerErrorCannotRemoveFile) == 0){
status = NSLocalizedString(@"Unable to remove original
file.", @"AutoFile error message");
fix = NSLocalizedString(@"Copy original file.", @"AutoFile
fix");
- statusFlag = BDSKCannotRemoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotRemoveFile;
// cleanup: move back
if(![fm moveItemAtURL:resolvedNewURL toURL:resolvedURL
error:NULL] && [resolvedURL checkResourceIsReachableAndReturnError:NULL]){
[fm removeItemAtURL:resolvedNewURL error:NULL];
@@ -468,12 +468,12 @@
}
}else{ // other error while moving file
status = NSLocalizedString(@"Unable to move file.", @"AutoFile
error message");
- statusFlag = BDSKCannotMoveFileErrorMask;
+ statusFlag = BDSKFilerErrorCannotMoveFile;
}
}
}
- if(statusFlag != BDSKNoError){
+ if(statusFlag != BDSKFilerErrorNone){
if(errorInfo)
*errorInfo = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber
numberWithInteger:ignoredError | statusFlag], BDSKFilerFlagKey, status,
BDSKFilerStatusKey, fix, BDSKFilerFixKey, nil];
return NO;
Modified: trunk/bibdesk/BDSKFilerErrorController.m
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.m 2023-10-05 16:28:28 UTC (rev
28393)
+++ trunk/bibdesk/BDSKFilerErrorController.m 2023-10-05 16:38:42 UTC (rev
28394)
@@ -187,13 +187,13 @@
switch(type){
case 0:
- if(statusFlag & BDSKSourceFileDoesNotExistErrorMask)
+ if(statusFlag & BDSKFilerErrorSourceFileDoesNotExist)
return;
path = [dict objectForKey:BDSKFilerOldPathKey];
[[NSWorkspace sharedWorkspace] selectFile:path
inFileViewerRootedAtPath:@""];
break;
case 1:
- if(!(statusFlag & BDSKTargetFileExistsErrorMask))
+ if(!(statusFlag & BDSKFilerErrorTargetFileExists))
return;
path = [dict objectForKey:BDSKFilerNewPathKey];
[[NSWorkspace sharedWorkspace] selectFile:path
inFileViewerRootedAtPath:@""];
Modified: trunk/bibdesk/BDSKPathColorTransformer.m
===================================================================
--- trunk/bibdesk/BDSKPathColorTransformer.m 2023-10-05 16:28:28 UTC (rev
28393)
+++ trunk/bibdesk/BDSKPathColorTransformer.m 2023-10-05 16:38:42 UTC (rev
28394)
@@ -55,7 +55,7 @@
- (id)transformedValue:(id)flag {
NSInteger statusFlag = [flag integerValue];
- if (statusFlag & BDSKSourceFileDoesNotExistErrorMask) {
+ if (statusFlag & BDSKFilerErrorSourceFileDoesNotExist) {
return [NSColor disabledControlTextColor];
} else {
return [NSColor controlTextColor];
@@ -77,9 +77,9 @@
- (id)transformedValue:(id)flag {
NSInteger statusFlag = [flag integerValue];
- if (statusFlag & BDSKTargetFileExistsErrorMask) {
+ if (statusFlag & BDSKFilerErrorTargetFileExists) {
return [NSColor controlTextColor];
- } else if (statusFlag & BDSKIncompleteFieldsErrorMask) {
+ } else if (statusFlag & BDSKFilerErrorIncompleteFields) {
return [NSColor systemRedColor];
} else {
return [NSColor controlTextColor];
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
