Changeset 51 for trunk/Cocoa/Pester/Source/NJRTableDelegate.m

Timestamp:

11/18/02 08:57:41 (21 years ago)

Author:

Nicholas Riley

Message:

Alarms.nib: Removed horizontal scroll bar. Turned on grid. Set delegate to NJRTableDelegate instead of PSAlarmSetController.

NJRTableDelegate: In general, made functional (was previously unused). Fixed MyCompanyName. Changed ORDER_BY_CONTEXT to use key-value coding instead of assuming data consists of a dictionary of dictionaries. Added sorting support (reorderedData, replaces oData) with autosave support for sort context. Added _positionTypeSelectDisplay, which adjusts position and justification of type select display control based on the current sort column. Added support for reverse sorting in type select string. Use table data source instead of sorted data so text matches as displayed (this will break with non-text cells...).

NJRTableView: Adapted from iTableView (Jaguar table alternate table background color), TableTester (most everything else) and NJROutlineView (keyDown, moveToBeginning/EndOfDocument). Support for type selection, delete shortcut for row deletion, and iTunes-alike background colors and frame.

NSCharacterSet-NJRExtensions: Moved _typeSelectSet from NJROutlineView as it's now shared with NJRTableView. Still need to factor NJROutlineView as embedded in HostLauncher some day.

PSAlarm: Reorganized, renamed and categorized methods. Added time accessor for the benefit of sorting. Renamed compare: to compareDate: for clarity. Added compareMessage:, though it's currently unused. Renamed cancel to cancelTimer for clarity.

PSAlarmSetController: More fun with initial first responder on window show/hide; still need to work around bug properly (subclass NSComboBox?) and fix it for real. As is, works for OS X 10.1.

PSAlarms: Added alarms accessor, returning alarm array. Fixed memory leak on successful alarm removal (oops). Added removeAlarms:, needed with sorted alarm list.

PSAlarmsController: Set window resize increment. Changes to table delegate methods to use reordered alarm list. Register for NSTableViewSelectionDidChangeNotification now we're no longer the table view delegate. Fixed autoselection in alarmsChanged by using data reordering support in NJRTableView. Implement NJRTableViewDataSource to permit deletion from table view.

Pester.pbproj: Added new files.

Read Me.rtfd: Added TableTester/iTableView acknowledgements. Updated release notes.

File:

• trunk/Cocoa/Pester/Source/NJRTableDelegate.m (modified) (8 diffs)

trunk/Cocoa/Pester/Source/NJRTableDelegate.m

@@ -4 +4 @@
 //
 //  Created by Nicholas Riley on Sun Oct 27 2002.
-//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
 
@@ -14 +14 @@
 typedef struct { NSString *key; BOOL descending; } SortContext;
 
-// Sort array of itemNums, by looking up the itemNum in the dictionary of dictionaries.
+// Sort array of itemNums, by looking up the itemNum in the dictionary of objects.
 // based on code of Ondra Cada <ocs@ocs.cz> on cocoa-dev list
 
@@ -25 +25 @@
 
         if (context->descending) {
-            first  = [right objectForKey: key];
-            second = [left  objectForKey: key];
+            first  = [right valueForKey: key];
+            second = [left  valueForKey: key];
         } else {
-            first  = [left  objectForKey: key];
-            second = [right objectForKey: key];
+            first  = [left  valueForKey: key];
+            second = [right valueForKey: key];
         }
 
@@ -41 +41 @@
 }
 
+@interface NJRTableDelegate (Private)
+
+- (void)_positionTypeSelectDisplay;
+- (void)_sortByColumn:(NSTableColumn *)inTableColumn;
+
+@end
+
 @implementation NJRTableDelegate
 
 #pragma mark initialize-release
 
+- (void)awakeFromNib;
+{
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_positionTypeSelectDisplay) name: NSViewFrameDidChangeNotification object: tableView];
+}
+
 - (void)dealloc
 {
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
     [sortingColumn release];
     [sortingKey release];
+    [reorderedData release];
     [super dealloc];
 }
@@ -68 +82 @@
 }
 
+#pragma mark sorting
+
+- (NSString *)_sortContextDefaultKey;
+{
+    NSString *autosaveName = [tableView autosaveName];
+    if (autosaveName != nil)
+        return [NSString stringWithFormat: @"NJRTableDelegate SortContext %@", autosaveName];
+    else
+        return nil;
+}
+
+- (void)_sortData;
+{
+    SortContext ctxt = { sortingKey, sortDescending };
+    NSString *sortContextKey = [self _sortContextDefaultKey];
+
+    if (sortContextKey != nil) {
+        [[NSUserDefaults standardUserDefaults] setObject:
+            [NSDictionary dictionaryWithObjectsAndKeys: sortingKey, @"sortingKey", [NSNumber numberWithBool: sortDescending], @"sortDescending", nil]
+                                                    forKey: [self _sortContextDefaultKey]];
+    }
+    
+    // sort the NSMutableArray
+    [reorderedData sortUsingFunction: ORDER_BY_CONTEXT context: &ctxt];
+    [tableView reloadData];
+}
+
+- (void)_sortByColumn:(NSTableColumn *)inTableColumn;
+{
+    NSSet *oldSelection = [self selectedItems];
+    if (sortingColumn == inTableColumn) {
+        // User clicked same column, change sort order
+        sortDescending = !sortDescending;
+        // Possible optimization: Don't actually re-sort if you just change the sorting direction; instead, just display either the nth item or the (count-1-n)th item depending on ascending/descending.)
+    } else {
+        // User clicked new column, change old/new column headers, save new sorting column, and re-sort the array.
+        if (sortingColumn != nil) {
+            [tableView setIndicatorImage: nil inTableColumn: sortingColumn];
+            sortDescending = NO; // on initial sort, preserve previous sort order
+        }
+        [self setSortingKey: [inTableColumn identifier]];
+        [self setSortingColumn: inTableColumn];
+        [tableView setHighlightedTableColumn: inTableColumn];
+    }
+    [tableView setIndicatorImage: (sortDescending ? [NSTableView descendingSortIndicator] : [NSTableView ascendingSortIndicator]) inTableColumn: inTableColumn];
+    [self _positionTypeSelectDisplay];
+    // Actually sort the data
+    [self _sortData];
+    [self selectItems: oldSelection];
+}
+
+- (void)_initialSortData;
+{
+    NSString *sortContextKey = [self _sortContextDefaultKey];
+    NSDictionary *sortContext;
+    NSString *key;
+    NSTableColumn *column;
+
+    if (sortContextKey == nil) goto noContext;
+    if ( (sortContext = [[NSUserDefaults standardUserDefaults] dictionaryForKey: sortContextKey]) == nil) goto noContext;
+    if ( (key = [sortContext objectForKey: @"sortingKey"]) == nil) goto noContext;
+    if ( (column = [tableView tableColumnWithIdentifier: key]) == nil) goto noContext;
+    sortDescending = [[sortContext objectForKey: @"sortDescending"] boolValue];
+    [self _sortByColumn: column];
+    return;
+    
+noContext:
+    sortDescending = NO;
+    [self _sortByColumn: [[tableView tableColumns] objectAtIndex: 0]];
+}
+
+- (NSMutableArray *)reorderedDataForData:(NSArray *)data;
+{
+    if (reorderedData == nil) {
+        reorderedData = [data mutableCopy];
+        [self _initialSortData];
+    } else {
+        NSSet *oldSelection = [self selectedItems];
+        [reorderedData release]; reorderedData = nil;
+        reorderedData = [data mutableCopy];
+        [self _sortData];
+        [self selectItems: oldSelection];
+    }
+    return reorderedData;
+}
+
+#pragma mark type selection
+
+- (void)_positionTypeSelectDisplay;
+{
+    [tableView resetTypeSelect]; // avoid extraneous matching
+    if ([tableView typeSelectDisplay] != nil && sortingColumn != nil) {
+        NSControl *typeSelectControl = [tableView typeSelectDisplay];
+        if ([typeSelectControl isKindOfClass: [NSControl class]]) {
+            NSView *superview = [typeSelectControl superview];
+            NSRect columnRect = [superview convertRect: [tableView rectOfColumn: [tableView columnWithIdentifier: sortingKey]] fromView: tableView];
+            // XXX support horizontal scroll bar/clipping (not for Pester, but eventually)
+            NSRect tableScrollFrame = [[tableView enclosingScrollView] frame];
+            NSRect selectFrame = [typeSelectControl frame];
+            [superview setNeedsDisplayInRect: selectFrame]; // fix artifacts caused by moving view
+            selectFrame.origin.x = columnRect.origin.x;
+            selectFrame.size.width = columnRect.size.width;
+            [typeSelectControl setAlignment: [[sortingColumn dataCell] alignment]];
+            [typeSelectControl setFrame: selectFrame];
+        }
+    }
+}
+
 #pragma mark saving/restoring selection
 
@@ -77 +199 @@
 
     while ( (rowNum = [e nextObject]) != nil) {
-        id item = [oData objectAtIndex: [rowNum intValue]];
+        id item = [reorderedData objectAtIndex: [rowNum intValue]];
         [result addObject: item];
     }
@@ -92 +214 @@
 
     while ( (item = [e nextObject]) != nil ) {
-        int row = [oData indexOfObjectIdenticalTo: item];
+        int row = [reorderedData indexOfObjectIdenticalTo: item];
         if (row != NSNotFound) {
             [tableView selectRow: row byExtendingSelection: YES];
@@ -101 +223 @@
 }
 
-// ----------------------------------------------------------------------------------------
-// Sorting
-// ----------------------------------------------------------------------------------------
-
-- (void)sortData
-{
-    SortContext ctxt = { sortingKey, sortDescending };
-    NSSet *oldSelection = [self selectedItems];
-
-    // sort the NSMutableArray
-    [oData sortUsingFunction: ORDER_BY_CONTEXT context: &ctxt];
-
-    [tableView reloadData];
-    [self selectItems: oldSelection];
-}
-
-- (void)sortByColumn:(NSTableColumn *)inTableColumn;
-{
-    if (sortingColumn == inTableColumn) {
-        // User clicked same column, change sort order
-        sortDescending = !sortDescending;
-        // Possible optimization: Don't actually re-sort if you just change the sorting direction;
-        // instead, just display either the nth item or the (count-1-n)th item depending on ascending/descending.)
+@end
+
+@implementation NJRTableDelegate (NJRTableViewDelegate)
+
+- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)inTableColumn
+{
+    [[tableView window] makeFirstResponder: aTableView];
+    [self _sortByColumn: inTableColumn];
+}
+
+- (void)tableViewColumnDidResize:(NSNotification *)notification;
+{
+    [self _positionTypeSelectDisplay];
+}
+
+- (void)tableViewColumnDidMove:(NSNotification *)notification;
+{
+    [self _positionTypeSelectDisplay];
+}
+
+- (void)tableView:(NSTableView *)aTableView selectRowMatchingString:(NSString *)matchString;
+{
+    // Look for a highlighted column, presuming we are sorted by that column, and search its values.
+    NSTableColumn *col = [aTableView highlightedTableColumn];
+    id dataSource = [aTableView dataSource];
+    int i, rowCount = [reorderedData count];
+    if (nil == col) return;
+    if (sortDescending) {
+        for ( i = rowCount - 1 ; i >= 0 ; i-- ) {
+            NSComparisonResult order = [matchString caseInsensitiveCompare:
+                [dataSource tableView: aTableView objectValueForTableColumn: col row: i]];
+            if (order != NSOrderedDescending) break;
+        }
+        if (i < 0) i = 0;
     } else {
-        // User clicked new column, change old/new column headers,
-        // save new sorting column, and re-sort the array.
-        sortDescending = NO;
-        if (nil != sortingColumn) {
-            [tableView setIndicatorImage: nil inTableColumn: sortingColumn];
-        }
-        [self setSortingKey: [inTableColumn identifier]];
-        [self setSortingColumn: inTableColumn];
-        [tableView setHighlightedTableColumn: inTableColumn];
-    }
-    [tableView setIndicatorImage: (sortDescending ? [NSTableView descendingSortIndicator] : [NSTableView ascendingSortIndicator]) inTableColumn: inTableColumn];
-    // Actually sort the data
-    [self sortData];
-}
-
-//      Sort by whatever column was clicked upon
-- (void)tableView:(NSTableView*)aTableView didClickTableColumn:(NSTableColumn *)inTableColumn
-{
-    [[tableView window] makeFirstResponder: aTableView]; // help make this tableView be first responder
-    [self sortByColumn:inTableColumn];
-}
-
-// ----------------------------------------------------------------------------------------
-// Alphabetic Type Ahead
-// ----------------------------------------------------------------------------------------
-
-- (void) typeAheadString:(NSString *)inString;
-{
-    // This general sample looks for a highlighted column, presuming that is that column we are sorted by, and uses that as the lookup key.
-    NSTableColumn *col = [tableView highlightedTableColumn];
-    if (nil != col) {
-        NSString *key = [col identifier];
-        int i;
-        for ( i = 0 ; i < [oData count] ; i++ ) {
-            NSDictionary *rowDict = [oData objectAtIndex:i];
-            NSString *compareTo = [rowDict objectForKey:key];
-            NSComparisonResult order = [inString caseInsensitiveCompare:compareTo];
+        for ( i = 0 ; i < rowCount ; i++ ) {
+            NSComparisonResult order = [matchString caseInsensitiveCompare:
+                [dataSource tableView: aTableView objectValueForTableColumn: col row: i]];
             if (order != NSOrderedDescending) break;
         }
-        // Make sure we're not overflowing the row count.
-        if (i >= [oData count]) {
-            i = [oData count] - 1;
-        }
-        // Now select row i -- either the one we found, or the last row if not found.
-        [tableView selectRow:i byExtendingSelection:NO];
-        [tableView scrollRowToVisible:i];
-    }
+        if (i >= rowCount) i = rowCount - 1;
+    }
+    // Now select row i -- either the one we found, or the first/last row if not found.
+    [aTableView selectRow: i byExtendingSelection: NO];
+    [aTableView scrollRowToVisible: i];
 }