Revision: 22599
http://sourceforge.net/p/bibdesk/svn/22599
Author: hofman
Date: 2018-09-14 20:46:57 +0000 (Fri, 14 Sep 2018)
Log Message:
-----------
combine duplicate code blocks
Modified Paths:
--------------
trunk/bibdesk/BibDocument_Groups.m
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2018-09-14 20:41:32 UTC (rev 22598)
+++ trunk/bibdesk/BibDocument_Groups.m 2018-09-14 20:46:57 UTC (rev 22599)
@@ -1273,14 +1273,7 @@
oldValue = [[[pub valueOfField:field] retain] autorelease];
rv = [pub addToGroup:group handleInherited:handleInherited];
- if(rv == BDSKFieldActionSet || rv == BDSKFieldActionAppend){
- count++;
- if(field && [field isEqualToString:BDSKPubTypeString] == NO){
- [changedPubs addObject:pub];
- [oldValues addObject:oldValue ?: @""];
- [newValues addObject:[pub valueOfField:field]];
- }
- }else if(rv == BDSKFieldActionAsk){
+ if(rv == BDSKFieldActionAsk){
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:NSLocalizedString(@"Inherited Value",
@"Message in alert dialog when trying to edit inherited value")];
[alert setInformativeText:NSLocalizedString(@"One or more items
have a value that was inherited from an item linked to by the Crossref field.
This operation would break the inheritance for this value. What do you want me
to do with inherited values?", @"Informative text in alert dialog")];
@@ -1288,17 +1281,18 @@
if (field && [field isSingleValuedGroupField] == NO)
[[alert addButtonWithTitle:NSLocalizedString(@"Append",
@"Button title")] setTag:BDSKFieldActionAppend];
[[alert addButtonWithTitle:NSLocalizedString(@"Set", @"Button
title")] setTag:BDSKFieldActionSet];
- rv = [alert runModal];
- handleInherited = rv;
- if(handleInherited != BDSKFieldActionIgnore){
+ handleInherited = rv = [alert runModal];
+ if(rv != BDSKFieldActionIgnore)
[pub addToGroup:group handleInherited:handleInherited];
- count++;
- if(field && [field isEqualToString:BDSKPubTypeString] == NO){
- [changedPubs addObject:pub];
- [oldValues addObject:oldValue ?: @""];
- [newValues addObject:[pub valueOfField:field]];
- }
- }
+ }
+
+ if(rv == BDSKFieldActionSet || rv == BDSKFieldActionAppend){
+ count++;
+ if(field && [field isEqualToString:BDSKPubTypeString] == NO){
+ [changedPubs addObject:pub];
+ [oldValues addObject:oldValue ?: @""];
+ [newValues addObject:[pub valueOfField:field]];
+ }
}
}
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
