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

[hofman--- via Bibdesk-commit]

Revision: 22790
          http://sourceforge.net/p/bibdesk/svn/22790
Author:   hofman
Date:     2018-10-10 16:51:49 +0000 (Wed, 10 Oct 2018)
Log Message:
-----------
Edit content for renamed files

Modified Paths:
--------------
    trunk/bibdesk/BDSKFileURLCommand.h
    trunk/bibdesk/BDSKFileURLCommand.m
    trunk/bibdesk/Scripting/BibDesk.sdef

Modified: trunk/bibdesk/BDSKFileURLCommand.h
===================================================================
--- trunk/bibdesk/BDSKFileURLCommand.h  2018-10-10 16:48:14 UTC (rev 22789)
+++ trunk/bibdesk/BDSKFileURLCommand.h  2018-10-10 16:51:49 UTC (rev 22790)
@@ -1,5 +1,5 @@
 //
-//  BDSKURLFileCommand.h
+//  BDSKFileURLCommand.h
 //  BibDesk
 //
 //  Created by Christiaan on 09/10/2018.
@@ -38,10 +38,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface BDSKURLFileCommand : NSScriptCommand
+@interface BDSKFileURLCommand : NSScriptCommand
 @end
 
-@interface BDSKFileURLCommand : NSScriptCommand
+@interface BDSKURLFileCommand : NSScriptCommand
 @end
 
 @interface BDSKRelativePathCommand : NSScriptCommand

Modified: trunk/bibdesk/BDSKFileURLCommand.m
===================================================================
--- trunk/bibdesk/BDSKFileURLCommand.m  2018-10-10 16:48:14 UTC (rev 22789)
+++ trunk/bibdesk/BDSKFileURLCommand.m  2018-10-10 16:51:49 UTC (rev 22790)
@@ -1,5 +1,5 @@
 //
-//  BDSKURLFileCommand.m
+//  BDSKFileURLCommand.m
 //  BibDesk
 //
 //  Created by Christiaan on 09/10/2018.
@@ -36,32 +36,32 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "BDSKURLFileCommand.h"
+#import "BDSKFileURLCommand.h"
 #import "NSString_BDSKExtensions.h"
 
-@implementation BDSKURLFileCommand
+@implementation BDSKFileURLCommand
 
 - (id)performDefaultImplementation  {
-    NSString *fileURL = [self evaluatedReceivers] ?: [self directParameter];
-    if ([fileURL isKindOfClass:[NSString class]] == NO) {
+    NSDictionary *args = [self evaluatedArguments];
+    NSURL *fileURL = [args objectForKey:@"of"];
+    if ([fileURL isKindOfClass:[NSURL class]] == NO) {
         [self setScriptErrorNumber:NSArgumentsWrongScriptError];
         return nil;
     }
-    return [NSURL URLWithString:fileURL];
+    return [fileURL absoluteString];
 }
 
 @end
 
-@implementation BDSKFileURLCommand
+@implementation BDSKURLFileCommand
 
 - (id)performDefaultImplementation  {
-    NSDictionary *args = [self evaluatedArguments];
-    NSURL *fileURL = [args objectForKey:@"of"];
-    if ([fileURL isKindOfClass:[NSURL class]] == NO) {
+    NSString *fileURL = [self evaluatedReceivers] ?: [self directParameter];
+    if ([fileURL isKindOfClass:[NSString class]] == NO) {
         [self setScriptErrorNumber:NSArgumentsWrongScriptError];
         return nil;
     }
-    return [fileURL absoluteString];
+    return [NSURL URLWithString:fileURL];
 }
 
 @end

Modified: trunk/bibdesk/Scripting/BibDesk.sdef
===================================================================
--- trunk/bibdesk/Scripting/BibDesk.sdef        2018-10-10 16:48:14 UTC (rev 
22789)
+++ trunk/bibdesk/Scripting/BibDesk.sdef        2018-10-10 16:51:49 UTC (rev 
22790)
@@ -752,13 +752,6 @@
             </result>
         </command>
         
-        <command name="URL file" code="BDSKURLf"
-            description="A file object specified with a file URL.">
-            <cocoa class="BDSKURLFileCommand"/>
-            <direct-parameter type="text" description="The file URL."/>
-            <result description="The file." type="file"/>
-        </command>
-        
         <command name="file URL" code="BDSKfURL"
             description="A file URL for a file.">
             <cocoa class="BDSKFileURLCommand"/>
@@ -769,6 +762,13 @@
             <result description="The file URL of the file." type="text"/>
         </command>
         
+        <command name="URL file" code="BDSKURLf"
+            description="A file object specified with a file URL.">
+            <cocoa class="BDSKURLFileCommand"/>
+            <direct-parameter type="text" description="The file URL."/>
+            <result description="The file." type="file"/>
+        </command>
+        
         <command name="relative path" code="BDSKrelP"
             description="The relative path for a file from a base file.">
             <cocoa class="BDSKRelativePathCommand"/>

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