Revision: 28255
http://sourceforge.net/p/bibdesk/svn/28255
Author: hofman
Date: 2023-05-22 16:28:43 +0000 (Mon, 22 May 2023)
Log Message:
-----------
use enum for crossref error
Modified Paths:
--------------
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BibItem.h
trunk/bibdesk/BibItem.m
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2023-05-22 14:21:43 UTC (rev 28254)
+++ trunk/bibdesk/BDSKEditor.m 2023-05-22 16:28:43 UTC (rev 28255)
@@ -2233,7 +2233,7 @@
} else {
// check whether we won't crossref to the new citekey
- NSInteger errorCode = [publication canSetCiteKey:[control
stringValue]];
+ BDSKCrossrefError errorCode = [publication canSetCiteKey:[control
stringValue]];
if (errorCode == BDSKSelfCrossrefError)
message = NSLocalizedString(@"An item cannot cross reference
to itself.", @"Informative text in alert dialog");
else if (errorCode != BDSKNoCrossrefError) // shouldn't happen
@@ -2260,7 +2260,7 @@
NSString *message = nil;
// check whether we won't get a crossref chain
- NSInteger errorCode = [publication canSetCrossref:obj];
+ BDSKCrossrefError errorCode = [publication canSetCrossref:obj];
if (errorCode == BDSKSelfCrossrefError)
message = NSLocalizedString(@"An item cannot cross
reference to itself.", @"Informative text in alert dialog");
else if (errorCode == BDSKChainCrossrefError)
@@ -2904,7 +2904,7 @@
NSString *message = nil;
// first check if we don't create a Crossref chain
- NSInteger errorCode = [publication canSetCrossref:crossref];
+ BDSKCrossrefError errorCode = [publication canSetCrossref:crossref];
if (errorCode == BDSKSelfCrossrefError)
message = NSLocalizedString(@"An item cannot cross
reference to itself.", @"Informative text in alert dialog");
else if (errorCode == BDSKChainCrossrefError)
@@ -3125,7 +3125,7 @@
return NO;
// first check if we don't create a Crossref chain
- NSInteger errorCode = [publication canSetCrossref:crossref];
+ BDSKCrossrefError errorCode = [publication
canSetCrossref:crossref];
NSString *message = nil;
if (errorCode == BDSKSelfCrossrefError)
message = NSLocalizedString(@"An item cannot cross
reference to itself.", @"Informative text in alert dialog");
Modified: trunk/bibdesk/BibItem.h
===================================================================
--- trunk/bibdesk/BibItem.h 2023-05-22 14:21:43 UTC (rev 28254)
+++ trunk/bibdesk/BibItem.h 2023-05-22 16:28:43 UTC (rev 28255)
@@ -54,7 +54,7 @@
extern NSString *BDSKBibItemURLScheme;
-enum {
+typedef NS_ENUM(NSInteger, BDSKCrossrefError) {
BDSKNoCrossrefError,
BDSKSelfCrossrefError,
BDSKChainCrossrefError,
@@ -599,7 +599,7 @@
@discussion -
@result 0: no problem, 1: crossref to self, 2: crossref to item with
crossref, 3: self is crossreffed
*/
-- (NSInteger)canSetCrossref:(NSString *)aCrossref;
+- (BDSKCrossrefError)canSetCrossref:(NSString *)aCrossref;
/*
@method canSetCiteKey:
@@ -607,7 +607,7 @@
@discussion -
@result 0: no problem, 1: crossref to self, 2: crossref to item with
crossref, 3: self is crossreffed
*/
-- (NSInteger)canSetCiteKey:(NSString *)aCiteKey;
+- (BDSKCrossrefError)canSetCiteKey:(NSString *)aCiteKey;
/*!
@method setCiteKey:withModDate:
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2023-05-22 14:21:43 UTC (rev 28254)
+++ trunk/bibdesk/BibItem.m 2023-05-22 16:28:43 UTC (rev 28255)
@@ -1147,8 +1147,8 @@
return NO;
}
-- (NSInteger)canSetCrossref:(NSString *)aCrossref{
- NSInteger errorCode = BDSKNoCrossrefError;
+- (BDSKCrossrefError)canSetCrossref:(NSString *)aCrossref{
+ BDSKCrossrefError errorCode = BDSKNoCrossrefError;
if ([NSString isEmptyString:aCrossref] == NO) {
NSString *aCiteKey = [self citeKey];
if ([aCiteKey isCaseInsensitiveEqual:aCrossref])
@@ -1161,8 +1161,8 @@
return errorCode;
}
-- (NSInteger)canSetCiteKey:(NSString *)aCiteKey{
- NSInteger errorCode = BDSKNoCrossrefError;
+- (BDSKCrossrefError)canSetCiteKey:(NSString *)aCiteKey{
+ BDSKCrossrefError errorCode = BDSKNoCrossrefError;
NSString *aCrossref = [self valueOfField:BDSKCrossrefString inherit:NO];
if ([NSString isEmptyString:aCrossref] == NO) {
if ([aCiteKey isCaseInsensitiveEqual:aCrossref])
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
