Revision: 24008
http://sourceforge.net/p/bibdesk/svn/24008
Author: hofman
Date: 2019-07-12 15:50:57 +0000 (Fri, 12 Jul 2019)
Log Message:
-----------
rename method
Modified Paths:
--------------
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKFileContentSearchController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKWebView.m
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/NSWorkspace_BDSKExtensions.h
trunk/bibdesk/NSWorkspace_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2019-07-12 14:23:46 UTC (rev 24007)
+++ trunk/bibdesk/BDSKEditor.m 2019-07-12 15:50:57 UTC (rev 24008)
@@ -475,7 +475,7 @@
for (fileURL in urls) {
if ([fileURL isEqual:[NSNull null]] == NO) {
- [[NSWorkspace sharedWorkspace] openLinkedURL:fileURL];
+ [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:fileURL];
}
}
}
@@ -511,7 +511,7 @@
for (remoteURL in urls) {
if ([remoteURL isEqual:[NSNull null]] == NO) {
- [[NSWorkspace sharedWorkspace] openLinkedURL:remoteURL];
+ [[NSWorkspace sharedWorkspace]
openURLWithDefaultApp:remoteURL];
}
}
}
@@ -1144,7 +1144,7 @@
- (IBAction)tableButtonAction:(id)sender{
NSString *field = [fields objectAtIndex:[tableView clickedRow]];
if ([field isURLField])
- [[NSWorkspace sharedWorkspace] openLinkedURL:[publication
URLForField:field]];
+ [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:[publication
URLForField:field]];
else
[self openParentItemForField:[field
isEqualToString:BDSKCrossrefString] ? nil : field];
}
@@ -1727,7 +1727,7 @@
}
- (BOOL)fileView:(FVFileView *)aFileView shouldOpenURL:(NSURL *)aURL {
- return [[NSWorkspace sharedWorkspace] openLinkedURL:aURL] == NO;
+ return [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:aURL] == NO;
}
- (NSDragOperation)fileView:(FVFileView *)aFileView validateDrop:(id
<NSDraggingInfo>)info proposedIndex:(NSUInteger)anIndex
proposedDropOperation:(FVDropOperation)dropOperation
proposedDragOperation:(NSDragOperation)dragOperation {
@@ -2701,7 +2701,7 @@
NSString *path = [[[BDSKPersistentSearch sharedSearch]
resultsForQuery:queryStringWithCiteKey(aLink) attribute:(id)kMDItemPath]
firstObject];
// if it was a valid key/link, we should definitely have a path,
but better make sure
if (path)
- [[NSWorkspace sharedWorkspace] openLinkedURL:[NSURL
fileURLWithPath:path isDirectory:NO]];
+ [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:[NSURL
fileURLWithPath:path isDirectory:NO]];
else
NSBeep();
} else {
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-12 14:23:46 UTC
(rev 24007)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-12 15:50:57 UTC
(rev 24008)
@@ -189,7 +189,7 @@
[alert beginSheetModalForWindow:[tableView window] modalDelegate:nil
didEndSelector:NULL contextInfo:NULL];
} else if(isDir){
// just open it with the Finder; we shouldn't have folders in our
index, though
- [[NSWorkspace sharedWorkspace] openLinkedURL:fileURL];
+ [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:fileURL];
} else if(![[NSWorkspace sharedWorkspace] openURL:fileURL
withSearchString:[searchField stringValue]]){
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:NSLocalizedString(@"Unable to Open File",
@"Message in alert dialog when unable to open file")];
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-12 14:23:46 UTC (rev
24007)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-12 15:50:57 UTC (rev
24008)
@@ -304,7 +304,7 @@
for (NSString *path in paths) {
if(type == 1)
- [ws openLinkedURL:[NSURL fileURLWithPath:path isDirectory:NO]];
+ [ws openURLWithDefaultApp:[NSURL fileURLWithPath:path
isDirectory:NO]];
else
[ws selectFile:path inFileViewerRootedAtPath:@""];
}
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2019-07-12 14:23:46 UTC (rev 24007)
+++ trunk/bibdesk/BDSKWebView.m 2019-07-12 15:50:57 UTC (rev 24008)
@@ -160,7 +160,7 @@
NSDictionary *element = (NSDictionary *)[sender representedObject];
NSURL *theURL = [element objectForKey:WebElementLinkURLKey];
if (theURL)
- [[NSWorkspace sharedWorkspace] openLinkedURL:theURL];
+ [[NSWorkspace sharedWorkspace] openURLWithDefaultApp:theURL];
}
@end
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2019-07-12 14:23:46 UTC (rev 24007)
+++ trunk/bibdesk/BibDocument_Actions.m 2019-07-12 15:50:57 UTC (rev 24008)
@@ -780,7 +780,7 @@
NSArray *urls = [(NSArray *)contextInfo autorelease] ?: [self
clickedOrSelectedRemoteURLs];
for (NSURL *remoteURL in urls) {
if ([remoteURL isEqual:[NSNull null]] == NO) {
- [[NSWorkspace sharedWorkspace] openLinkedURL:remoteURL];
+ [[NSWorkspace sharedWorkspace]
openURLWithDefaultApp:remoteURL];
}
}
}
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2019-07-12 14:23:46 UTC (rev
24007)
+++ trunk/bibdesk/BibDocument_DataSource.m 2019-07-12 15:50:57 UTC (rev
24008)
@@ -1500,7 +1500,7 @@
if ([aURL isFileURL])
return NO == [self openLinkedFileURL:aURL];
else
- return NO == [[NSWorkspace sharedWorkspace] openLinkedURL:aURL];
+ return NO == [[NSWorkspace sharedWorkspace]
openURLWithDefaultApp:aURL];
}
- (void)fileView:(FVFileView *)aFileView willPopUpMenu:(NSMenu *)menu
onIconAtIndex:(NSUInteger)anIndex {
Modified: trunk/bibdesk/NSWorkspace_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSWorkspace_BDSKExtensions.h 2019-07-12 14:23:46 UTC (rev
24007)
+++ trunk/bibdesk/NSWorkspace_BDSKExtensions.h 2019-07-12 15:50:57 UTC (rev
24008)
@@ -51,7 +51,7 @@
*/
- (BOOL)openURL:(NSURL *)fileURL withSearchString:(NSString *)searchString;
-- (BOOL)openLinkedURL:(NSURL *)aURL;
+- (BOOL)openURLWithDefaultApp:(NSURL *)aURL;
- (BOOL)openURL:(NSURL *)aURL withApplicationURL:(NSURL *)applicationURL;
- (NSArray *)editorAndViewerURLsForURL:(NSURL *)aURL;
Modified: trunk/bibdesk/NSWorkspace_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSWorkspace_BDSKExtensions.m 2019-07-12 14:23:46 UTC (rev
24007)
+++ trunk/bibdesk/NSWorkspace_BDSKExtensions.m 2019-07-12 15:50:57 UTC (rev
24008)
@@ -61,7 +61,7 @@
NSParameterAssert([fileURL isFileURL]);
if ([NSString isEmptyString:searchString])
- return [self openLinkedURL:fileURL];
+ return [self openURLWithDefaultApp:fileURL];
// Find the application that should open this file
BOOL success = NO;
@@ -106,7 +106,7 @@
return success;
}
-- (BOOL)openLinkedURL:(NSURL *)aURL {
+- (BOOL)openURLWithDefaultApp:(NSURL *)aURL {
BOOL rv = NO;
NSString *appID = nil;
if ([aURL isFileURL]) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
