Revision: 28396
http://sourceforge.net/p/bibdesk/svn/28396
Author: hofman
Date: 2023-10-06 09:09:21 +0000 (Fri, 06 Oct 2023)
Log Message:
-----------
Rename argument, don't use local variable for bitmap bits
Modified Paths:
--------------
trunk/bibdesk/BDSKFiler.h
trunk/bibdesk/BDSKFiler.m
Modified: trunk/bibdesk/BDSKFiler.h
===================================================================
--- trunk/bibdesk/BDSKFiler.h 2023-10-06 08:54:37 UTC (rev 28395)
+++ trunk/bibdesk/BDSKFiler.h 2023-10-06 09:09:21 UTC (rev 28396)
@@ -111,7 +111,7 @@
@param paperInfos A list of info dictionaries containing a
BibItem, a BDSKLinkedFile and for non-initial autofiles a target path.
@param field The field for which to move the linked files.
@param doc The parent document of the papers.
- @param mask Integer, see the AutoFileOptionMask enum for
options.
+ @param options Integer, see the AutoFileOption enum for
options.
@param actionName The undo action name to use.
@discussion This is the core method to move files.
It is undoable, but only moves that were succesfull are registered for undo.
@@ -121,7 +121,7 @@
BDSKAutoFileOptionCheckComplete indicates that for initial moves a check will
be done whether all required fields are set.
BDSKAutoFileOptionForce forces AutoFiling, even if there may be problems
moving the file.
*/
-- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)masks
actionName:(NSString *)actionName;
+- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)options
actionName:(NSString *)actionName;
/*!
@method moveItemAtURL:toURL:force:error:
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2023-10-06 08:54:37 UTC (rev 28395)
+++ trunk/bibdesk/BDSKFiler.m 2023-10-06 09:09:21 UTC (rev 28396)
@@ -115,14 +115,14 @@
if ([self checkPapersFolder] == NO)
return;
- BDSKFilerOptions mask = BDSKAutoFileOptionGenerate;
- if (check) mask |= BDSKAutoFileOptionCheckComplete;
+ BDSKFilerOptions options = BDSKAutoFileOptionGenerate;
+ if (check) options |= BDSKAutoFileOptionCheckComplete;
NSMutableArray *paperInfos = [NSMutableArray arrayWithCapacity:[papers
count]];
for (BDSKLinkedFile *file in papers)
[paperInfos addObject:[NSDictionary dictionaryWithObjectsAndKeys:file,
BDSKFilerFileKey, [file delegate], BDSKFilerPublicationKey, nil]];
- [self movePapers:paperInfos forField:BDSKLocalFileString fromDocument:doc
options:mask actionName:actionName];
+ [self movePapers:paperInfos forField:BDSKLocalFileString fromDocument:doc
options:options actionName:actionName];
}
- (void)autoFileItems:(NSArray *)items forField:(NSString *)field
fromDocument:(BibDocument *)doc check:(BOOL)check actionName:(NSString
*)actionName {
@@ -129,14 +129,14 @@
if ([self checkPapersFolder] == NO)
return;
- BDSKFilerOptions mask = BDSKAutoFileOptionGenerate;
- if (check) mask |= BDSKAutoFileOptionCheckComplete;
+ BDSKFilerOptions options = BDSKAutoFileOptionGenerate;
+ if (check) options |= BDSKAutoFileOptionCheckComplete;
NSMutableArray *paperInfos = [NSMutableArray arrayWithCapacity:[items
count]];
for (BibItem *item in items)
[paperInfos addObject:[NSDictionary dictionaryWithObjectsAndKeys:item,
BDSKFilerPublicationKey, nil]];
- [self movePapers:paperInfos forField:field fromDocument:doc options:mask
actionName:actionName];
+ [self movePapers:paperInfos forField:field fromDocument:doc
options:options actionName:actionName];
}
- (void)queuePendingFiling:(void (^)(void))pending {
@@ -154,7 +154,7 @@
}
}
-- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)mask
actionName:(NSString *)actionName {
+- (void)movePapers:(NSArray *)paperInfos forField:(NSString *)field
fromDocument:(BibDocument *)doc options:(BDSKFilerOptions)options
actionName:(NSString *)actionName {
NSInteger numberOfPapers = [paperInfos count];
if (numberOfPapers == 0)
@@ -162,7 +162,7 @@
if (filing) {
[self queuePendingFiling:^{
- [self movePapers:paperInfos forField:field fromDocument:doc
options:mask actionName:actionName];
+ [self movePapers:paperInfos forField:field fromDocument:doc
options:options actionName:actionName];
}];
return;
}
@@ -172,10 +172,6 @@
NSMutableArray *fileInfoDicts = [NSMutableArray
arrayWithCapacity:numberOfPapers];
NSMutableArray *errorInfoDicts = [NSMutableArray arrayWithCapacity:5];
- BOOL undo = (mask & BDSKAutoFileOptionUndo) != 0;
- BOOL generate = (mask & BDSKAutoFileOptionGenerate) != 0;
- BOOL force = (mask & BDSKAutoFileOptionForce) != 0;
- BOOL check = (mask & BDSKAutoFileOptionCheckComplete) != 0;
BOOL isLinkedFiles = [field isEqualToString:BDSKLocalFileString];
//if (generate && [field isEqualToString:BDSKLocalFileString] == NO &&
[field isEqualToString:BDSKLocalUrlString] == NO)
@@ -196,11 +192,11 @@
id paperInfo = [paperInfos objectAtIndex:i];
BDSKLinkedFile *file = [paperInfo valueForKey:BDSKFilerFileKey];
BibItem *pub = [paperInfo valueForKey:BDSKFilerPublicationKey];
- BDSKFilerError ignoredError = force ? [[paperInfo
valueForKey:BDSKFilerFlagKey] integerValue] : BDSKFilerErrorNone;
+ BDSKFilerError ignoredError = (options & BDSKAutoFileOptionForce)
? [[paperInfo valueForKey:BDSKFilerFlagKey] integerValue] : BDSKFilerErrorNone;
NSString *oldPath = nil;
NSString *newPath = nil;
- if (generate == NO) // new path provided, e.g. undo
+ if ((options & BDSKAutoFileOptionGenerate) == 0) // new path
provided, e.g. undo
newPath = [paperInfo valueForKey:BDSKFilerNewPathKey];
else if (isLinkedFiles) // initial auto file of file
newPath = [[pub suggestedURLForLinkedFile:file] path];
@@ -208,7 +204,7 @@
newPath = [[pub suggestedURLForField:field] path];
if (isLinkedFiles)
oldPath = [file path];
- else if (undo)
+ else if ((options & BDSKAutoFileOptionUndo))
oldPath = [paperInfo valueForKey:BDSKFilerOldPathKey];
else
oldPath = [[pub localFileURLForField:field] path];
@@ -231,7 +227,7 @@
[info setValue:newPath forKey:BDSKFilerNewPathKey];
[info setValue:pub forKey:BDSKFilerPublicationKey];
- if (check && (ignoredError & BDSKFilerErrorIncompleteFields)
== 0 && NO == (isLinkedFiles ? [pub canSetURLForLinkedFile:file] : [pub
canSetURLForField:field])) {
+ if ((options & BDSKAutoFileOptionCheckComplete) &&
(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 |
BDSKFilerErrorIncompleteFields] forKey:BDSKFilerFlagKey];
@@ -313,7 +309,7 @@
[[self window] orderOut:nil];
if ([fileInfoDicts count] > 0) {
- if (isLinkedFiles == NO && undo == NO) {
+ if (isLinkedFiles == NO && (options & BDSKAutoFileOptionUndo)
== 0) {
// for initial changes to local file fields, set the field
now,
// so it will be in the same undo group
// if this is not an initial move, undo should take care
of this
@@ -329,7 +325,7 @@
}
if ([errorInfoDicts count] > 0) {
- BDSKFilerErrorController *errorController =
[[[BDSKFilerErrorController alloc] initWithErrors:errorInfoDicts forField:field
options:mask actionName:actionName] autorelease];
+ BDSKFilerErrorController *errorController =
[[[BDSKFilerErrorController alloc] initWithErrors:errorInfoDicts forField:field
options:options actionName:actionName] autorelease];
[doc addWindowController:errorController];
[errorController showWindow:nil];
}
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
