From 7e162f59515ace98bbe23c059738cab3bb8c310e Mon Sep 17 00:00:00 2001
From: hsoft <none@none>
Date: Mon, 15 Jun 2009 08:06:11 +0000
Subject: [PATCH] [#29] me cocoa: removed code that has been pushed down to
 dgbase.

--HG--
extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%4049
---
 me/cocoa/Info.plist     |  2 +-
 me/cocoa/ResultWindow.h |  6 -----
 me/cocoa/ResultWindow.m | 59 -----------------------------------------
 3 files changed, 1 insertion(+), 66 deletions(-)

diff --git a/me/cocoa/Info.plist b/me/cocoa/Info.plist
index 97d43767..92004dd8 100644
--- a/me/cocoa/Info.plist
+++ b/me/cocoa/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.1</string>
+	<string>5.6.2</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/me/cocoa/ResultWindow.h b/me/cocoa/ResultWindow.h
index e421b99d..430cfe36 100644
--- a/me/cocoa/ResultWindow.h
+++ b/me/cocoa/ResultWindow.h
@@ -11,7 +11,6 @@
     IBOutlet NSSearchField *filterField;
     IBOutlet NSSegmentedControl *pmSwitch;
     IBOutlet NSWindow *preferencesPanel;
-    IBOutlet NSTextField *stats;
     
     NSString *_lastAction;
     DetailsPanel *_detailsPanel;
@@ -38,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;
@@ -47,10 +45,6 @@
 - (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/me/cocoa/ResultWindow.m b/me/cocoa/ResultWindow.m
index eb4530c2..d1861093 100644
--- a/me/cocoa/ResultWindow.m
+++ b/me/cocoa/ResultWindow.m
@@ -26,8 +26,6 @@
     [self refreshStats];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsMarkingChanged:) name:ResultsMarkingChangedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(duplicateSelectionChanged:) name:DuplicateSelectionChangedNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resultsChanged:) name:ResultsChangedNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     
     NSToolbar *t = [[[NSToolbar alloc] initWithIdentifier:@"ResultWindowToolbar"] autorelease];
     [t setAllowsUserCustomization:YES];
@@ -234,13 +232,6 @@
     }
 }
 
-- (IBAction)switchSelected:(id)sender
-{
-    [self performPySelection:[self getSelectedPaths:YES]];
-    [py makeSelectedReference];
-    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
-}
-
 - (IBAction)toggleColumn:(id)sender
 {
     NSMenuItem *mi = sender;
@@ -334,43 +325,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"];
@@ -396,11 +350,6 @@
     [_resultColumns addObject:[self getColumnForIdentifier:18 title:@"Dupe Count" width:80 refCol:refCol]];
 }
 
--(void)refreshStats
-{
-    [stats setStringValue:[py getStatLine]];
-}
-
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
 {
     NSTableColumn *col;
@@ -489,14 +438,6 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:DuplicateSelectionChangedNotification object:self];
 }
 
-- (void)resultsChanged:(NSNotification *)aNotification
-{
-    [matches reloadData];
-    [self expandAll:nil];
-    [self outlineViewSelectionDidChange:nil];
-    [self refreshStats];
-}
-
 - (void)resultsMarkingChanged:(NSNotification *)aNotification
 {
     [matches invalidateMarkings];