Revision: 12587
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=12587&view=rev
Author: hofman
Date: 2008-01-19 11:51:09 -0800 (Sat, 19 Jan 2008)
Log Message:
-----------
No need to have a separate class to script the clipboard, just use a property
specifier.
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController+Scripting.h
trunk/bibdesk/BDSKAppController+Scripting.m
trunk/bibdesk/BDSKExportUsingTemplateCommand.m
trunk/bibdesk/BibDocument+Scripting.m
Modified: trunk/bibdesk/BDSKAppController+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKAppController+Scripting.h 2008-01-19 19:06:56 UTC (rev
12586)
+++ trunk/bibdesk/BDSKAppController+Scripting.h 2008-01-19 19:51:09 UTC (rev
12587)
@@ -63,7 +63,3 @@
@end
-
-
[EMAIL PROTECTED] BDSKClipboard : NSObject
[EMAIL PROTECTED]
Modified: trunk/bibdesk/BDSKAppController+Scripting.m
===================================================================
--- trunk/bibdesk/BDSKAppController+Scripting.m 2008-01-19 19:06:56 UTC (rev
12586)
+++ trunk/bibdesk/BDSKAppController+Scripting.m 2008-01-19 19:51:09 UTC (rev
12587)
@@ -37,7 +37,6 @@
*/
#import "BDSKAppController+Scripting.h"
-#import "BDSKApplication.h"
#import <OmniFoundation/OFPreference.h>
#import "BDSKScriptHookManager.h"
#import "BDSKTypeManager.h"
@@ -71,7 +70,11 @@
}
- (id)clipboard {
- return [[[BDSKClipboard alloc] init] autorelease];
+ NSScriptClassDescription *containerClassDescription =
(NSScriptClassDescription *)[NSClassDescription classDescriptionForClass:[NSApp
class]];
+ return [[[NSPropertySpecifier allocWithZone: [self zone]]
+ initWithContainerClassDescription: containerClassDescription
+ containerSpecifier: nil // the application is the
null container
+ key: @"clipboard"] autorelease];
}
- (BDSKScriptHook *)valueInScriptHooksWithUniqueID:(NSNumber *)uniqueID {
@@ -110,18 +113,3 @@
}
@end
-
-
[EMAIL PROTECTED] BDSKClipboard
-
-- (NSScriptObjectSpecifier *)objectSpecifier {
- // this is necessary as our container is the application
- NSScriptClassDescription *containerClassDescription =
(NSScriptClassDescription *)[NSClassDescription
classDescriptionForClass:[BDSKApplication class]];
- return [[[NSPropertySpecifier allocWithZone: [self zone]]
- initWithContainerClassDescription: containerClassDescription
- containerSpecifier: nil // the application is the
null container
- key: @"clipboard"] autorelease];
-}
-
[EMAIL PROTECTED]
-
Modified: trunk/bibdesk/BDSKExportUsingTemplateCommand.m
===================================================================
--- trunk/bibdesk/BDSKExportUsingTemplateCommand.m 2008-01-19 19:06:56 UTC
(rev 12586)
+++ trunk/bibdesk/BDSKExportUsingTemplateCommand.m 2008-01-19 19:51:09 UTC
(rev 12587)
@@ -42,7 +42,6 @@
#import "BDSKPublicationsArray.h"
#import "NSArray_BDSKExtensions.h"
#import "BibItem.h"
-#import "BDSKAppController+Scripting.h"
@implementation BDSKExportUsingTemplateCommand
@@ -112,9 +111,7 @@
return nil;
} else if ([fileObj isKindOfClass:[NSURL class]]) {
fileURL = (NSURL*)fileObj;
- } else if ([fileObj isKindOfClass:[BDSKClipboard class]]) {
- fileURL = nil;
- } else {
+ } else if ([fileObj isKindOfClass:[NSPropertySpecifier class]] == NO ||
[[fileObj key] isEqualToString:@"clipboard"] == NO) {
[self setScriptErrorNumber:NSArgumentsWrongScriptError];
return nil;
}
Modified: trunk/bibdesk/BibDocument+Scripting.m
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.m 2008-01-19 19:06:56 UTC (rev
12586)
+++ trunk/bibdesk/BibDocument+Scripting.m 2008-01-19 19:51:09 UTC (rev
12587)
@@ -47,7 +47,6 @@
#import "NSArray_BDSKExtensions.h"
#import "BDSKMacroResolver.h"
#import "BDSKPreviewer.h"
-#import "BDSKAppController+Scripting.h"
#import <Quartz/Quartz.h>
@implementation BibDocument (Scripting)
@@ -282,7 +281,11 @@
}
- (id)clipboard {
- return [[[BDSKClipboard alloc] init] autorelease];
+ NSScriptClassDescription *containerClassDescription =
(NSScriptClassDescription *)[NSClassDescription classDescriptionForClass:[NSApp
class]];
+ return [[[NSPropertySpecifier allocWithZone: [self zone]]
+ initWithContainerClassDescription: containerClassDescription
+ containerSpecifier: nil // the application is the
null container
+ key: @"clipboard"] autorelease];
}
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
