probably better to copy documents in 10.9

jeromelebel · Apr 13, 2015 · a00da40 · a00da40
1 parent 5092a30
commit a00da40
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 36 deletions.
diff --git a/Sources/ConnectionWindow/MHConnectionWindowController.m b/Sources/ConnectionWindow/MHConnectionWindowController.m
@@ -215,6 +215,23 @@ - (void)windowDidLoad
     [self.databaseCollectionOutlineView setDoubleAction:@selector(sidebarDoubleAction:)];
 }
 
+// REMOVE when 10.9 is not supported anymore
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
+{
+    return [self.tabViewController.selectedTabItemViewController respondsToSelector:@selector(canPerformCopy)]
+        && [(id)self.tabViewController.selectedTabItemViewController canPerformCopy];
+}
+
+// REMOVE when 10.9 is not supported anymore
+- (void)copy:(id)sender
+{
+    if ([self.tabViewController.selectedTabItemViewController respondsToSelector:@selector(canPerformCopy)]
+        && [(id)self.tabViewController.selectedTabItemViewController canPerformCopy]
+        && [self.tabViewController.selectedTabItemViewController respondsToSelector:@selector(performCopy)]) {
+        [(id)self.tabViewController.selectedTabItemViewController performCopy];
+    }
+}
+
 - (void)sidebarDoubleAction:(id)sender
 {
     [self query:sender];

diff --git a/Sources/ConnectionWindow/MHDocumentOutlineViewController.m b/Sources/ConnectionWindow/MHDocumentOutlineViewController.m
@@ -251,10 +251,17 @@ - (BOOL)canCopyDocuments
     return (id)self.view.window.firstResponder == self.outlineView && self.selectedDocumentCount > 0;
 }
 
-// Code to add when 10.9 will not be supported anymore
-// BEGIN-COPY-PASTE-OUTLINEVIEW
-// 3 parts
-/*
+- (void)copyDocuments
+{
+    if ((id)self.view.window.firstResponder == self.outlineView && self.selectedDocumentCount > 0) {
+        NSPasteboard *pasteboard;
+
+        pasteboard = NSPasteboard.generalPasteboard;
+        [pasteboard clearContents];
+        [self outlineView:self.outlineView writeItems:self.selectedDocuments toPasteboard:pasteboard];
+    }
+}
+
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
 {
     if (anItem.action == @selector(copy:)) {
@@ -265,19 +272,8 @@ - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
 
 - (void)copy:(id)sender
 {
-    [self copyDocuments];
-}
-*/
-// END
-
-- (void)copyDocuments
-{
-    if ((id)self.view.window.firstResponder == self.outlineView && self.selectedDocumentCount > 0) {
-        NSPasteboard *pasteboard;
-
-        pasteboard = NSPasteboard.generalPasteboard;
-        [pasteboard clearContents];
-        [self outlineView:self.outlineView writeItems:self.selectedDocuments toPasteboard:pasteboard];
+    if ([self canCopyDocuments]) {
+        [self copyDocuments];
     }
 }
 

diff --git a/Sources/ConnectionWindow/MHQueryViewController.h b/Sources/ConnectionWindow/MHQueryViewController.h
@@ -78,6 +78,9 @@
 - (IBAction)segmentedControlAction:(id)sender;
 
 - (void)jsonWindowWillClose:(id)sender;
+- (BOOL)canPerformCopy;
+- (void)performCopy;
+
 @end
 
 @interface MHQueryViewController (InsertTab)

diff --git a/Sources/ConnectionWindow/MHQueryViewController.m b/Sources/ConnectionWindow/MHQueryViewController.m
@@ -449,37 +449,29 @@ - (void)selectBestTextField
     [self.findQueryTextField.window makeFirstResponder:self.tabView.selectedTabViewItem.initialFirstResponder ];
 }
 
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
+// REMOVE when 10.9 is not supported anymore
+- (BOOL)canPerformCopy
 {
-// Code to remove when 10.9 will not be supported anymore
-// BEGIN-COPY-PASTE-OUTLINEVIEW
-// 3 parts
-    if (anItem.action == @selector(copy:)) {
-        if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"find"]) {
-            return self.findDocumentOutlineViewController.canCopyDocuments;
-        } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"aggregation"]) {
-            return self.aggregationDocumentOutlineViewController.canCopyDocuments;
-        } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"mapreduce"]) {
-            return self.mrDocumentOutlineViewController.canCopyDocuments;
-        }
+    if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"find"]) {
+        return self.findDocumentOutlineViewController.canCopyDocuments;
+    } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"aggregation"]) {
+        return self.aggregationDocumentOutlineViewController.canCopyDocuments;
+    } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"mapreduce"]) {
+        return self.mrDocumentOutlineViewController.canCopyDocuments;
     }
-// END
-    return [self respondsToSelector:anItem.action];
+    return NO;
 }
 
-- (void)copy:(id)sender
+// REMOVE when 10.9 is not supported anymore
+- (void)performCopy
 {
-// Code to remove when 10.9 will not be supported anymore
-// BEGIN-COPY-PASTE-OUTLINEVIEW
-// 3 parts
     if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"find"] && self.findDocumentOutlineViewController.canCopyDocuments) {
         [self.findDocumentOutlineViewController copyDocuments];
     } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"aggregation"] && self.aggregationDocumentOutlineViewController.canCopyDocuments) {
         [self.aggregationDocumentOutlineViewController copyDocuments];
     } else if ([[self.tabView selectedTabViewItem].identifier isEqualToString:@"mapreduce"] && self.mrDocumentOutlineViewController.canCopyDocuments) {
         [self.mrDocumentOutlineViewController copyDocuments];
     }
-// END
 }
 
 @end

diff --git a/Sources/ConnectionWindow/MHStatusViewController.m b/Sources/ConnectionWindow/MHStatusViewController.m
@@ -120,4 +120,16 @@ - (MODQuery *)showCollectionStatusWithCollectionItem:(MHCollectionItem *)collect
     return result;
 }
 
+// REMOVE when 10.9 is not supported anymore
+- (BOOL)canPerformCopy
+{
+    return self.documentOutlineViewController.canCopyDocuments;
+}
+
+// REMOVE when 10.9 is not supported anymore
+- (void)performCopy
+{
+    [self.documentOutlineViewController copyDocuments];
+}
+
 @end