[Bibdesk-commit] SF.net SVN: bibdesk:[25119] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 25119
          http://sourceforge.net/p/bibdesk/svn/25119
Author:   hofman
Date:     2020-12-02 16:13:28 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Remove declarations and fallback for 10.7 support

Modified Paths:
--------------
    trunk/bibdesk/BDSKAppleScript.m
    trunk/bibdesk/BDSKCompatibility.h
    trunk/bibdesk/BDSKScriptMenu.m

Modified: trunk/bibdesk/BDSKAppleScript.m
===================================================================
--- trunk/bibdesk/BDSKAppleScript.m     2020-12-02 16:08:34 UTC (rev 25118)
+++ trunk/bibdesk/BDSKAppleScript.m     2020-12-02 16:13:28 UTC (rev 25119)
@@ -38,28 +38,8 @@
 
 #import "BDSKAppleScript.h"
 
-#if SDK_BEFORE(10_8)
-
-@interface NSUserScriptTask : NSObject
-- (id)initWithURL:(NSURL *)url error:(NSError **)error;
-- (void)executeWithCompletionHandler:(void (^)(NSError *error))handler;
-@end
-
-@interface NSUserAppleScriptTask : NSUserScriptTask
-- (void)executeWithAppleEvent:(NSAppleEventDescriptor *)event 
completionHandler:(void (^)(NSAppleEventDescriptor *result, NSError 
*error))handler;
-@end
-
-#endif
-
 @implementation BDSKAppleScript
 
-static Class NSUserAppleScriptTaskClass = Nil;
-
-+ (void)initialize {
-    BDSKINITIALIZE;
-    NSUserAppleScriptTaskClass = NSClassFromString(@"NSUserAppleScriptTask");
-}
-
 + (dispatch_queue_t)appleScriptQueue {
     static dispatch_queue_t appleScriptQueue;
     if (appleScriptQueue == NULL)
@@ -82,14 +62,7 @@
 - (id)initWithURL:(NSURL *)url error:(NSError **)error {
     self = [super init];
     if (self) {
-        if (NSUserAppleScriptTaskClass) {
-            appleScript = [[NSUserAppleScriptTaskClass alloc] initWithURL:url 
error:error];
-        } else {
-            NSDictionary *errorDict = nil;
-            appleScript = [[NSAppleScript alloc] initWithContentsOfURL:url 
error:&errorDict];
-            if (appleScript == nil && error != NULL)
-                *error = errorFromDictionary(errorDict);
-        }
+        appleScript = [[NSUserAppleScriptTask alloc] initWithURL:url 
error:error];
         if (appleScript == nil) {
             [self release];
             self = nil;

Modified: trunk/bibdesk/BDSKCompatibility.h
===================================================================
--- trunk/bibdesk/BDSKCompatibility.h   2020-12-02 16:08:34 UTC (rev 25118)
+++ trunk/bibdesk/BDSKCompatibility.h   2020-12-02 16:13:28 UTC (rev 25119)
@@ -43,12 +43,6 @@
 
 #if SDK_BEFORE(10_13)
 
-#ifndef NSAppKitVersionNumber10_7
-    #define NSAppKitVersionNumber10_7 1138
-#endif
-#ifndef NSAppKitVersionNumber10_8
-    #define NSAppKitVersionNumber10_8 1187
-#endif
 #ifndef NSAppKitVersionNumber10_9
     #define NSAppKitVersionNumber10_9 1265
 #endif

Modified: trunk/bibdesk/BDSKScriptMenu.m
===================================================================
--- trunk/bibdesk/BDSKScriptMenu.m      2020-12-02 16:08:34 UTC (rev 25118)
+++ trunk/bibdesk/BDSKScriptMenu.m      2020-12-02 16:13:28 UTC (rev 25119)
@@ -44,15 +44,6 @@
 #import "NSFileManager_BDSKExtensions.h"
 #import "BDSKAppleScript.h"
 
-#if SDK_BEFORE(10_8)
-
-@interface NSUserScriptTask : NSObject
-- (id)initWithURL:(NSURL *)url error:(NSError **)error;
-- (void)executeWithCompletionHandler:(void (^)(NSError *error))handler;
-@end
-
-#endif
-
 #define SCRIPTS_MENU_TITLE  @"Scripts"
 #define SCRIPTS_FOLDER_NAME @"Scripts"
 #define FILENAME_KEY        @"filename"
@@ -344,12 +335,7 @@
             }
         }
     } else if ([wm isAutomatorWorkflowAtPath:scriptFilename] || [fm 
isExecutableFileAtPath:scriptFilename]) {
-        if (NSClassFromString(@"NSUserScriptTask"))
-            [[[[NSClassFromString(@"NSUserScriptTask") alloc] 
initWithURL:[NSURL fileURLWithPath:scriptFilename isDirectory:NO] error:NULL] 
autorelease] executeWithCompletionHandler:NULL];
-        else if ([wm isAutomatorWorkflowAtPath:scriptFilename])
-            [BDSKTask launchedTaskWithLaunchPath:@"/usr/bin/automator" 
arguments:[NSArray arrayWithObjects:scriptFilename, nil]];
-        else
-            [BDSKTask launchedTaskWithLaunchPath:scriptFilename 
arguments:[NSArray array]];
+        [[[[NSUserScriptTask alloc] initWithURL:[NSURL 
fileURLWithPath:scriptFilename isDirectory:NO] error:NULL] autorelease] 
executeWithCompletionHandler:NULL];
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit