From ef9c7f1d254c4ccbaba9ef9191510cf7f20c6cb6 Mon Sep 17 00:00:00 2001 From: hsoft Date: Sun, 14 Jun 2009 14:50:05 +0000 Subject: [PATCH] [#29] se cocoa: the code handling ref switching is duplicated across editions. Moved it down to dgbase. --HG-- extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%4044 --- se/cocoa/ResultWindow.h | 4 ---- se/cocoa/ResultWindow.m | 43 ----------------------------------------- 2 files changed, 47 deletions(-) diff --git a/se/cocoa/ResultWindow.h b/se/cocoa/ResultWindow.h index 443d5afe..abb28e4d 100644 --- a/se/cocoa/ResultWindow.h +++ b/se/cocoa/ResultWindow.h @@ -37,7 +37,6 @@ - (IBAction)revealSelected:(id)sender; - (IBAction)showPreferencesPanel:(id)sender; - (IBAction)startDuplicateScan:(id)sender; -- (IBAction)switchSelected:(id)sender; - (IBAction)toggleColumn:(id)sender; - (IBAction)toggleDelta:(id)sender; - (IBAction)toggleDetailsPanel:(id)sender; @@ -46,10 +45,7 @@ - (NSTableColumn *)getColumnForIdentifier:(int)aIdentifier title:(NSString *)aTitle width:(int)aWidth refCol:(NSTableColumn *)aColumn; - (NSArray *)getColumnsOrder; - (NSDictionary *)getColumnsWidth; -- (NSArray *)getSelected:(BOOL)aDupesOnly; -- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly; - (void)initResultColumns; -- (void)performPySelection:(NSArray *)aIndexPaths; - (void)refreshStats; - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth; @end diff --git a/se/cocoa/ResultWindow.m b/se/cocoa/ResultWindow.m index f3910ca5..d4a29763 100644 --- a/se/cocoa/ResultWindow.m +++ b/se/cocoa/ResultWindow.m @@ -223,13 +223,7 @@ [Dialogs showMessage:@"The selected directories contain no scannable file."]; [app toggleDirectories:nil]; } -} -- (IBAction)switchSelected:(id)sender -{ - [self performPySelection:[self getSelectedPaths:YES]]; - [py makeSelectedReference]; - [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self]; } - (IBAction)toggleColumn:(id)sender @@ -325,43 +319,6 @@ return result; } -- (NSArray *)getSelected:(BOOL)aDupesOnly -{ - if (_powerMode) - aDupesOnly = NO; - NSIndexSet *indexes = [matches selectedRowIndexes]; - NSMutableArray *nodeList = [NSMutableArray array]; - OVNode *node; - int i = [indexes firstIndex]; - while (i != NSNotFound) - { - node = [matches itemAtRow:i]; - if (!aDupesOnly || ([node level] > 1)) - [nodeList addObject:node]; - i = [indexes indexGreaterThanIndex:i]; - } - return nodeList; -} - -- (NSArray *)getSelectedPaths:(BOOL)aDupesOnly -{ - NSMutableArray *r = [NSMutableArray array]; - NSArray *selected = [self getSelected:aDupesOnly]; - NSEnumerator *e = [selected objectEnumerator]; - OVNode *node; - while (node = [e nextObject]) - [r addObject:p2a([node indexPath])]; - return r; -} - -- (void)performPySelection:(NSArray *)aIndexPaths -{ - if (_powerMode) - [py selectPowerMarkerNodePaths:aIndexPaths]; - else - [py selectResultNodePaths:aIndexPaths]; -} - - (void)initResultColumns { NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];