Revision: 27585
http://sourceforge.net/p/bibdesk/svn/27585
Author: hofman
Date: 2022-06-08 19:26:54 +0000 (Wed, 08 Jun 2022)
Log Message:
-----------
Define table sort descriptor in a category rather than a separate subclass
Modified Paths:
--------------
trunk/bibdesk/BDSKSortCommand.m
trunk/bibdesk/BibDocument.m
trunk/bibdesk/NSArray_BDSKExtensions.m
trunk/bibdesk/NSSortDescriptor_BDSKExtensions.h
trunk/bibdesk/NSSortDescriptor_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKSortCommand.m
===================================================================
--- trunk/bibdesk/BDSKSortCommand.m 2022-06-08 19:20:48 UTC (rev 27584)
+++ trunk/bibdesk/BDSKSortCommand.m 2022-06-08 19:26:54 UTC (rev 27585)
@@ -37,7 +37,7 @@
*/
#import "BDSKSortCommand.h"
-#import "BDSKTableSortDescriptor.h"
+#import "NSSortDescriptor_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
#import "NSArray_BDSKExtensions.h"
#import "BibDocument.h"
@@ -80,10 +80,10 @@
BOOL isAscending = ascending ? [ascending boolValue] : YES;
BOOL isSubAscending = subAscending ? [subAscending boolValue] :
isAscending;
- BDSKTableSortDescriptor *sortDescriptor = [BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:normalizedKey(key) ascending:isAscending];
- BDSKTableSortDescriptor *subSortDescriptor = nil;
+ NSSortDescriptor *sortDescriptor = [NSSortDescriptor
tableSortDescriptorForIdentifier:normalizedKey(key) ascending:isAscending];
+ NSSortDescriptor *subSortDescriptor = nil;
if (subKey)
- [BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:normalizedKey(subKey)
ascending:isSubAscending];
+ [NSSortDescriptor
tableSortDescriptorForIdentifier:normalizedKey(subKey)
ascending:isSubAscending];
return [items sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:sortDescriptor, subSortDescriptor, nil]];
}
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2022-06-08 19:20:48 UTC (rev 27584)
+++ trunk/bibdesk/BibDocument.m 2022-06-08 19:26:54 UTC (rev 27585)
@@ -61,8 +61,7 @@
#import "BDSKFilterController.h"
#import "BibDocument_Groups.h"
#import "BibDocument_Search.h"
-#import "BDSKTableSortDescriptor.h"
-#import "BDSKTableSortDescriptor.h"
+#import "NSSortDescriptor_BDSKExtensions.h"
#import "BDSKFieldSheetController.h"
#import "BDSKPreviewer.h"
#import "BDSKEditor.h"
@@ -2391,8 +2390,8 @@
}
NSMutableArray *sortDescriptors = [NSMutableArray arrayWithObjects:
- [BDSKTableSortDescriptor tableSortDescriptorForIdentifier:sortKey
ascending:!docFlags.sortDescending],
- [BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:previousSortKey
ascending:!docFlags.previousSortDescending], nil];
+ [NSSortDescriptor tableSortDescriptorForIdentifier:sortKey
ascending:!docFlags.sortDescending],
+ [NSSortDescriptor tableSortDescriptorForIdentifier:previousSortKey
ascending:!docFlags.previousSortDescending], nil];
// Set the graphic for the new column header
NSTableColumn *oldTC = [tableView highlightedTableColumn];
@@ -2401,7 +2400,7 @@
if (tmpSortKey) {
newTC = [tableView tableColumnWithIdentifier:tmpSortKey];
ascending = !docFlags.tmpSortDescending;
- [sortDescriptors insertObject:[BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:tmpSortKey
ascending:!docFlags.tmpSortDescending] atIndex:0];
+ [sortDescriptors insertObject:[NSSortDescriptor
tableSortDescriptorForIdentifier:tmpSortKey
ascending:!docFlags.tmpSortDescending] atIndex:0];
} else {
newTC = [tableView tableColumnWithIdentifier:sortKey];
ascending = !docFlags.sortDescending;
Modified: trunk/bibdesk/NSArray_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSArray_BDSKExtensions.m 2022-06-08 19:20:48 UTC (rev
27584)
+++ trunk/bibdesk/NSArray_BDSKExtensions.m 2022-06-08 19:26:54 UTC (rev
27585)
@@ -37,7 +37,7 @@
*/
#import "NSArray_BDSKExtensions.h"
-#import "BDSKTableSortDescriptor.h"
+#import "NSSortDescriptor_BDSKExtensions.h"
#import "BDSKTemplateParser.h"
@@ -143,17 +143,17 @@
- (NSArray *)arraySortedByAuthor;
{
- return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:BDSKAuthorString ascending:YES], nil]];
+ return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[NSSortDescriptor
tableSortDescriptorForIdentifier:BDSKAuthorString ascending:YES], nil]];
}
- (NSArray *)arraySortedByAuthorOrEditor;
{
- return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:BDSKAuthorEditorString ascending:YES], nil]];
+ return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[NSSortDescriptor
tableSortDescriptorForIdentifier:BDSKAuthorEditorString ascending:YES], nil]];
}
- (NSArray *)arraySortedByTitle;
{
- return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[BDSKTableSortDescriptor
tableSortDescriptorForIdentifier:BDSKTitleString ascending:YES], nil]];
+ return [self sortedArrayUsingMergesortWithDescriptors:[NSArray
arrayWithObjects:[NSSortDescriptor
tableSortDescriptorForIdentifier:BDSKTitleString ascending:YES], nil]];
}
- (NSString *)componentsJoinedByComma
Modified: trunk/bibdesk/NSSortDescriptor_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSSortDescriptor_BDSKExtensions.h 2022-06-08 19:20:48 UTC
(rev 27584)
+++ trunk/bibdesk/NSSortDescriptor_BDSKExtensions.h 2022-06-08 19:26:54 UTC
(rev 27585)
@@ -1,5 +1,5 @@
//
-// BDSKTableSortDescriptor.h
+// NSSortDescriptor_BDSKExtensions.h
// Bibdesk
//
// Created by Christiaan Hofman on 12/11/05.
@@ -39,6 +39,8 @@
#import <Foundation/Foundation.h>
-@interface BDSKTableSortDescriptor : NSSortDescriptor
-+ (BDSKTableSortDescriptor *)tableSortDescriptorForIdentifier:(NSString *)tcID
ascending:(BOOL)ascend;
+@interface NSSortDescriptor (BDSKExtensions)
+
++ (NSSortDescriptor *)tableSortDescriptorForIdentifier:(NSString *)tcID
ascending:(BOOL)ascend;
+
@end
Modified: trunk/bibdesk/NSSortDescriptor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSSortDescriptor_BDSKExtensions.m 2022-06-08 19:20:48 UTC
(rev 27584)
+++ trunk/bibdesk/NSSortDescriptor_BDSKExtensions.m 2022-06-08 19:26:54 UTC
(rev 27585)
@@ -36,7 +36,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "BDSKTableSortDescriptor.h"
+#import "NSSortDescriptor_BDSKExtensions.h"
#import "BDSKTypeManager.h"
#import "BDSKStringConstants.h"
#import "NSColor_BDSKExtensions.h"
@@ -45,13 +45,13 @@
#import "NSURL_BDSKExtensions.h"
-@implementation BDSKTableSortDescriptor
+@implementation NSSortDescriptor (BDSKExtensions)
-+ (BDSKTableSortDescriptor *)tableSortDescriptorForIdentifier:(NSString *)tcID
ascending:(BOOL)ascend{
++ (NSSortDescriptor *)tableSortDescriptorForIdentifier:(NSString *)tcID
ascending:(BOOL)ascend{
NSParameterAssert([NSString isEmptyString:tcID] == NO);
- BDSKTableSortDescriptor *sortDescriptor = nil;
+ NSSortDescriptor *sortDescriptor = nil;
if([tcID isEqualToString:BDSKCiteKeyString]){
sortDescriptor = [[self alloc] initWithKey:@"citeKey"
ascending:ascend selector:@selector(localizedCaseInsensitiveNumericCompare:)];
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
