Move some common actions up in the responder chain.

rowanj · tiennou · Jul 12, 2014 · Jul 12, 2014 · Jul 15, 2014 · Jul 15, 2014
commit e05a628a960a8b18cce1f1b25fa62c13c981483a
diff --git a/Classes/Controllers/PBGitHistoryController.m b/Classes/Controllers/PBGitHistoryController.m
@@ -322,7 +322,11 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
     } else if ([menuItem action] == @selector(setTreeView:)) {
 		[menuItem setState:(self.selectedCommitDetailsIndex == kHistoryTreeViewIndex) ? NSOnState : NSOffState];
     }
-    return YES;
+
+    if ([self respondsToSelector:[menuItem action]])
+        return YES;
+
+    return [[self nextResponder] validateMenuItem:menuItem];
 }
 
 - (IBAction) setDetailedView:(id)sender
@@ -564,28 +568,6 @@ - (void)showCommitsFromTree:(id)sender
 	[searchController setHistorySearch:searchString mode:kGitXPathSearchMode];
 }
 
-- (void)showInFinderAction:(id)sender
-{
-	NSURL *workingDirectoryURL = self.repository.workingDirectoryURL;
-	NSMutableArray *URLs = [NSMutableArray array];
-
-	for (NSString *filePath in [sender representedObject]) {
-		[URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:filePath]];
-    }
-    [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:URLs];
-}
-
-- (void)openFilesAction:(id)sender
-{
-	NSURL *workingDirectoryURL = self.repository.workingDirectoryURL;
-	NSMutableArray *URLs = [NSMutableArray array];
-
-	for (NSString *filePath in [sender representedObject]) {
-        [URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:filePath]];
-    }
-    [[NSWorkspace sharedWorkspace] openURLs:URLs withAppBundleIdentifier:nil options:0 additionalEventParamDescriptor:nil launchIdentifiers:NULL];
-}
-
 - (void) checkoutFiles:(id)sender
 {
 	NSMutableArray *files = [NSMutableArray array];
@@ -641,7 +623,6 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 
 	NSArray *menuItems = [NSArray arrayWithObjects:historyItem, diffItem, checkoutItem, finderItem, openFilesItem, nil];
 	for (NSMenuItem *item in menuItems) {
-		[item setTarget:self];
 		[item setRepresentedObject:filePaths];
 	}
 

diff --git a/Classes/Controllers/PBGitIndexController.m b/Classes/Controllers/PBGitIndexController.m
@@ -17,6 +17,8 @@ @interface PBGitIndexController ()
 - (void)discardChangesForFiles:(NSArray *)files force:(BOOL)force;
 @end
 
+// FIXME: This isn't a view/window/whatever controller, though it acts like one...
+// See for example -menuForTable and its setTarget: calls.
 @implementation PBGitIndexController
 
 - (void)awakeFromNib
@@ -99,35 +101,30 @@ - (NSMenu *) menuForTable:(NSTableView *)table
 	if ([table tag] == 0) {
 		NSMenuItem *stageItem = [[NSMenuItem alloc] initWithTitle:@"Stage Changes" action:@selector(stageFilesAction:) keyEquivalent:@"s"];
 		[stageItem setTarget:self];
-		[stageItem setRepresentedObject:selectedFiles];
 		[menu addItem:stageItem];
 	}
 	else if ([table tag] == 1) {
 		NSMenuItem *unstageItem = [[NSMenuItem alloc] initWithTitle:@"Unstage Changes" action:@selector(unstageFilesAction:) keyEquivalent:@"u"];
 		[unstageItem setTarget:self];
-		[unstageItem setRepresentedObject:selectedFiles];
 		[menu addItem:unstageItem];
 	}
 
 	NSString *title = [selectedFiles count] == 1 ? @"Open file" : @"Open files";
 	NSMenuItem *openItem = [[NSMenuItem alloc] initWithTitle:title action:@selector(openFilesAction:) keyEquivalent:@""];
-	[openItem setTarget:self];
-	[openItem setRepresentedObject:selectedFiles];
+	[openItem setTarget:commitController.repository];
 	[menu addItem:openItem];
 
 	// Attempt to ignore
 	if ([self allSelectedCanBeIgnored:selectedFiles]) {
 		NSString *ignoreText = [selectedFiles count] == 1 ? @"Ignore File": @"Ignore Files";
 		NSMenuItem *ignoreItem = [[NSMenuItem alloc] initWithTitle:ignoreText action:@selector(ignoreFilesAction:) keyEquivalent:@""];
 		[ignoreItem setTarget:self];
-		[ignoreItem setRepresentedObject:selectedFiles];
 		[menu addItem:ignoreItem];
 	}
 
 	if ([selectedFiles count] == 1) {
 		NSMenuItem *showInFinderItem = [[NSMenuItem alloc] initWithTitle:@"Show in Finder" action:@selector(showInFinderAction:) keyEquivalent:@""];
-		[showInFinderItem setTarget:self];
-		[showInFinderItem setRepresentedObject:selectedFiles];
+		[showInFinderItem setTarget:commitController.repository];
 		[menu addItem:showInFinderItem];
     }
 
@@ -140,52 +137,63 @@ - (NSMenu *) menuForTable:(NSTableView *)table
 			break;
 		}
 	}
-	if (!addDiscardMenu)
-	{
-		return menu;
-	}
 
-	NSMenuItem *discardItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes…" action:@selector(discardFilesAction:) keyEquivalent:@""];
-	[discardItem setTarget:self];
-	[discardItem setAlternate:NO];
-	[discardItem setRepresentedObject:selectedFiles];
+	if (addDiscardMenu)
+    {
+        NSMenuItem *discardItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes…" action:@selector(discardFilesAction:) keyEquivalent:@""];
+        [discardItem setAlternate:NO];
+        [discardItem setTarget:self];
 
-	[menu addItem:discardItem];
+        [menu addItem:discardItem];
 
-	NSMenuItem *discardForceItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(forceDiscardFilesAction:) keyEquivalent:@""];
-	[discardForceItem setTarget:self];
-	[discardForceItem setAlternate:YES];
-	[discardForceItem setRepresentedObject:selectedFiles];
-	[discardForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
-	[menu addItem:discardForceItem];
-
-	BOOL trashInsteadOfDiscard = floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_7;
-	if (trashInsteadOfDiscard)
-	{
-		for (PBChangedFile* file in selectedFiles)
-		{
-			if (file.status != NEW)
-			{
-				trashInsteadOfDiscard = NO;
-				break;
-			}
-		}
-	}
-
-	if (trashInsteadOfDiscard && [selectedFiles count] > 0)
-	{
-		NSMenuItem* moveToTrashItem = [[NSMenuItem alloc] initWithTitle:@"Move to Trash" action:@selector(moveToTrashAction:) keyEquivalent:@""];
-		[moveToTrashItem setTarget:self];
-		[moveToTrashItem setRepresentedObject:selectedFiles];
-		[menu addItem:moveToTrashItem];
-
-		[menu removeItem:discardItem];
-		[menu removeItem:discardForceItem];
-	}
+        NSMenuItem *discardForceItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(forceDiscardFilesAction:) keyEquivalent:@""];
+        [discardForceItem setAlternate:YES];
+        [discardForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
+        [discardForceItem setTarget:self];
+        [menu addItem:discardForceItem];
 
+        BOOL trashInsteadOfDiscard = floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_7;
+        if (trashInsteadOfDiscard)
+        {
+            for (PBChangedFile* file in selectedFiles)
+            {
+                if (file.status != NEW)
+                {
+                    trashInsteadOfDiscard = NO;
+                    break;
+                }
+            }
+        }
+
+        if (trashInsteadOfDiscard && [selectedFiles count] > 0)
+        {
+            NSMenuItem* moveToTrashItem = [[NSMenuItem alloc] initWithTitle:@"Move to Trash" action:@selector(moveToTrashAction:) keyEquivalent:@""];
+            [moveToTrashItem setTarget:self];
+            [menu addItem:moveToTrashItem];
+
+            [menu removeItem:discardItem];
+            [menu removeItem:discardForceItem];
+        }
+    }
+
+    for (NSMenuItem *item in [menu itemArray]) {
+        [item setRepresentedObject:selectedFiles];
+    }
+
 	return menu;
 }
 
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+    if ([self respondsToSelector:[menuItem action]])
+        return YES;
+
+    if ([commitController respondsToSelector:[menuItem action]])
+        return YES;
+
+    return [[commitController nextResponder] validateMenuItem:menuItem];
+}
+
 - (void) stageSelectedFiles
 {
 	[commitController.index stageFiles:[unstagedFilesController selectedObjects]];
@@ -207,14 +215,6 @@ - (void) unstageFilesAction:(id) sender
 	[commitController.index unstageFiles:[sender representedObject]];
 }
 
-- (void) openFilesAction:(id) sender
-{
-	NSArray *files = [sender representedObject];
-	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
-	for (PBChangedFile *file in files)
-		[[NSWorkspace sharedWorkspace] openURL:[workingDirectoryURL URLByAppendingPathComponent:[file path]]];
-}
-
 - (void) ignoreFilesAction:(id) sender
 {
 	NSArray *selectedFiles = [sender representedObject];
@@ -239,17 +239,6 @@ - (void)forceDiscardFilesAction:(id) sender
 		[self discardChangesForFiles:selectedFiles force:TRUE];
 }
 
-- (void) showInFinderAction:(id) sender
-{
-	NSArray *selectedFiles = [sender representedObject];
-	if ([selectedFiles count] == 0)
-		return;
-	NSURL *workingDirectoryURL = commitController.repository.workingDirectoryURL;
-	NSURL *filePath = [workingDirectoryURL URLByAppendingPathComponent:[[selectedFiles objectAtIndex:0] path]];
-
-	[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[filePath]];
-}
-
 - (void)moveToTrashAction:(id)sender
 {
 	NSArray *selectedFiles = [sender representedObject];

diff --git a/Classes/git/PBGitRepository.h b/Classes/git/PBGitRepository.h
@@ -143,4 +143,7 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 // for the scripting bridge
 - (void)findInModeScriptCommand:(NSScriptCommand *)command;
 
+- (IBAction)showInFinderAction:(id)sender;
+- (IBAction)openFilesAction:(id)sender;
+
 @end
diff --git a/Classes/git/PBGitRepository.m b/Classes/git/PBGitRepository.m
@@ -170,6 +170,53 @@ - (void)showWindows
 	[super showWindows];
 }
 
+#pragma mark -
+#pragma mark NSResponder methods
+
+- (NSArray *)selectedURLsFromSender:(id)sender {
+	NSArray *selectedFiles = [sender representedObject];
+	if ([selectedFiles count] == 0)
+		return nil;
+
+	NSURL *workingDirectoryURL = self.workingDirectoryURL;
+	NSMutableArray *URLs = [NSMutableArray array];
+    for (id file in selectedFiles) {
+        NSString *path = file;
+        // Those can be PBChangedFiles sent by PBGitIndexController. Get their path.
+        if ([file respondsToSelector:@selector(path)]) {
+            path = [file path];
+        }
+
+        if (![path isKindOfClass:[NSString class]])
+            continue;
+        [URLs addObject:[workingDirectoryURL URLByAppendingPathComponent:path]];
+    }
+
+    return URLs;
+}
+
+- (IBAction)showInFinderAction:(id)sender {
+    NSArray *URLs = [self selectedURLsFromSender:sender];
+    if ([URLs count] == 0)
+        return;
+
+    [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:URLs];
+}
+
+- (IBAction)openFilesAction:(id)sender {
+    NSArray *URLs = [self selectedURLsFromSender:sender];
+
+    if ([URLs count] == 0)
+        return;
+
+    [[NSWorkspace sharedWorkspace] openURLs:URLs
+                    withAppBundleIdentifier:nil
+                                    options:0
+             additionalEventParamDescriptor:nil
+                          launchIdentifiers:NULL];
+}
+
+
 #pragma mark -
 #pragma mark Properties/General methods