Revision: 27586
http://sourceforge.net/p/bibdesk/svn/27586
Author: hofman
Date: 2022-06-08 19:33:50 +0000 (Wed, 08 Jun 2022)
Log Message:
-----------
make code more compact using ternary operators
Modified Paths:
--------------
trunk/bibdesk/NSArray_BDSKExtensions.m
Modified: trunk/bibdesk/NSArray_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSArray_BDSKExtensions.m 2022-06-08 19:26:54 UTC (rev
27585)
+++ trunk/bibdesk/NSArray_BDSKExtensions.m 2022-06-08 19:33:50 UTC (rev
27586)
@@ -428,28 +428,19 @@
static NSComparisonResult __BDCompareValuesWithSelector(id value1, id value2,
SEL selector)
{
// check to see if one of the values is nil
- if(value1 == nil){
- if(value2 == nil)
- return NSOrderedSame;
- else
- return NSOrderedDescending;
- } else if(value2 == nil){
+ if (value1 == nil)
+ return value2 == nil ? NSOrderedSame : NSOrderedDescending;
+ else if (value2 == nil)
return NSOrderedAscending;
- // this check only applies to NSString objects
- } else if([value1 isKindOfClass:[NSString class]] && [value2
isKindOfClass:[NSString class]]){
- if ([value1 isEqualToString:@""]) {
- if ([value2 isEqualToString:@""]) {
- return NSOrderedSame;
- } else {
- return NSOrderedDescending;
- }
- } else if ([value2 isEqualToString:@""]) {
+
+ // this check only applies to NSString objects
+ if ([value1 isKindOfClass:[NSString class]] && [value2
isKindOfClass:[NSString class]]) {
+ if ([value1 isEqualToString:@""])
+ return [value2 isEqualToString:@""] ? NSOrderedSame :
NSOrderedDescending;
+ else if ([value2 isEqualToString:@""])
return NSOrderedAscending;
- }
}
- NSComparisonResult result;
-
// we use the IMP directly since performSelector: returns an id
typedef NSComparisonResult (*comparatorIMP)(id, SEL, id);
comparatorIMP comparator = (comparatorIMP)[value1
methodForSelector:selector];
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
