Revision: 28612
http://sourceforge.net/p/bibdesk/svn/28612
Author: hofman
Date: 2024-01-15 17:12:09 +0000 (Mon, 15 Jan 2024)
Log Message:
-----------
remove deprecated file promises ccode paths
Modified Paths:
--------------
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BDSKSearchGroup.h
trunk/bibdesk/BDSKSearchGroup.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/NSPasteboard_BDSKExtensions.h
trunk/bibdesk/NSPasteboard_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2024-01-15 16:58:06 UTC (rev
28611)
+++ trunk/bibdesk/BDSKPersonController.m 2024-01-15 17:12:09 UTC (rev
28612)
@@ -52,7 +52,6 @@
#import "BDSKGroupsArray.h"
#import "BDSKExternalGroup.h"
#import "NSObject_BDSKExtensions.h"
-#import "NSPasteboard_BDSKExtensions.h"
#import "NSFileManager_BDSKExtensions.h"
#import "BDSKOwnerProtocol.h"
#import "NSPointerFunctions_BDSKExtensions.h"
@@ -459,15 +458,7 @@
if(data == nil)
return nil;
- id item = nil;
- Class providerClass = NSClassFromString(@"NSFilePromiseProvider");
- if (providerClass) {
- item = [[providerClass alloc] initWithFileType:(__bridge NSString
*)kUTTypeVCard delegate:self];
- } else {
- item = [[NSPasteboardItem alloc] init];
- [item setString:(__bridge NSString *)kUTTypeVCard forType:(__bridge
NSString *)kPasteboardTypeFilePromiseContent];
- [item setDataProvider:self forTypes:@[(NSString
*)kPasteboardTypeFileURLPromise, (__bridge NSString *)kUTTypeVCard]];
- }
+ id item = [[NSFilePromiseProvider alloc] initWithFileType:(__bridge
NSString *)kUTTypeVCard delegate:self];
return @[item];
}
@@ -477,18 +468,7 @@
}
- (void)pasteboard:(NSPasteboard *)pboard item:(NSPasteboardItem *)item
provideDataForType:(NSString *)type {
- if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFileURLPromise]) {
- NSURL *dropDestination = [pboard pasteLocationURL];
- if (dropDestination) {
- NSData *data = [person vCardRepresentation];
- NSString *fileName = [[person name]
stringByAppendingPathExtension:@"vcf"];
- NSURL *fileURL = [[NSFileManager defaultManager]
uniqueFileURLWithName:fileName atURL:dropDestination isDirectory:NO];
- [data writeToURL:fileURL atomically:YES];
- [item setString:[fileURL absoluteString] forType:type];
- } else {
- [item setString:@"" forType:type];
- }
- } else if ([type isEqualToString:(__bridge NSString *)kUTTypeVCard]) {
+ if ([type isEqualToString:(__bridge NSString *)kUTTypeVCard]) {
[item setData:[person vCardRepresentation] forType:type];
}
}
Modified: trunk/bibdesk/BDSKSearchGroup.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.h 2024-01-15 16:58:06 UTC (rev 28611)
+++ trunk/bibdesk/BDSKSearchGroup.h 2024-01-15 17:12:09 UTC (rev 28612)
@@ -67,7 +67,7 @@
- (void)terminate;
@end
-@interface BDSKSearchGroup : BDSKExternalGroup <BDSKSearchGroup,
NSPasteboardItemDataProvider, NSFilePromiseProviderDelegate> {
+@interface BDSKSearchGroup : BDSKExternalGroup <BDSKSearchGroup,
NSFilePromiseProviderDelegate> {
NSString *searchTerm; // passed in by caller
NSArray *history;
id<BDSKSearchGroupServer> server;
Modified: trunk/bibdesk/BDSKSearchGroup.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.m 2024-01-15 16:58:06 UTC (rev 28611)
+++ trunk/bibdesk/BDSKSearchGroup.m 2024-01-15 17:12:09 UTC (rev 28612)
@@ -309,42 +309,6 @@
return [server numberOfAvailableResults] > [server numberOfFetchedResults];
}
-#pragma mark NSPasteboardItemDataProvider
-
-- (void)pasteboard:(NSPasteboard *)pboard item:(NSPasteboardItem *)item
provideDataForType:(NSString *)type {
- if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFilePromiseContent]) {
- [item setString:@"net.sourceforge.bibdesk.bdsksearch" forType:type];
- } else if ([type isEqualToString:(__bridge NSString
*)kPasteboardTypeFileURLPromise]) {
- NSURL *dropDestination = [pboard pasteLocationURL];
-
- if (dropDestination) {
- NSMutableDictionary *plist = [[self dictionaryValue] mutableCopy];
-
- // we probably don't want to share this info with anyone else
- [plist removeObjectForKey:@"search term"];
- [plist removeObjectForKey:@"history"];
-
- if ([[item
propertyListForType:@"net.sourceforge.bibdesk.bdsksearch.includepassword"]
boolValue]) {
- NSString *password = nil;
- if ([[self serverInfo] getUsername:NULL password:&password]) {
- NSMutableDictionary *options = [[plist
objectForKey:@"options"] mutableCopy] ?: [NSMutableDictionary dictionary];
- [options setObject:password forKey:@"password"];
- [plist setObject:options forKey:@"options"];
- }
- }
-
- NSString *fileName = [[[self serverInfo] name]
stringByAppendingPathExtension:@"bdsksearch"];
-
- // make sure the filename is unique
- NSURL *fileURL = [[NSFileManager defaultManager]
uniqueFileURLWithName:fileName atURL:dropDestination isDirectory:NO];
- [plist writeToURL:fileURL atomically:YES];
- [item setString:[fileURL absoluteString] forType:type];
- } else {
- [item setString:@"" forType:type];
- }
- }
-}
-
#pragma mark NSFilePromiseProviderDelegate
- (NSString *)filePromiseProvider:(NSFilePromiseProvider *)filePromiseProvider
fileNameForType:(NSString *)fileType {
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2024-01-15 16:58:06 UTC (rev
28611)
+++ trunk/bibdesk/BibDocument_DataSource.m 2024-01-15 17:12:09 UTC (rev
28612)
@@ -1147,18 +1147,9 @@
}
if (success && searchGroup) {
- Class providerClass = NSClassFromString(@"NSFilePromiseProvider");
- id item = nil;
- if (providerClass) {
- item = [[providerClass alloc]
initWithFileType:@"net.sourceforge.bibdesk.bdsksearch" delegate:searchGroup];
+ id item = [[NSFilePromiseProvider alloc]
initWithFileType:@"net.sourceforge.bibdesk.bdsksearch" delegate:searchGroup];
if (([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0)
[item setUserInfo:@"BDSKIncludePassword"];
- } else {
- item = [[NSPasteboardItem alloc] init];
- [item setDataProvider:searchGroup forTypes:@[(__bridge NSString
*)kPasteboardTypeFileURLPromise, (__bridge NSString
*)kPasteboardTypeFilePromiseContent]];
- if (([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0)
- [item setPropertyList:@YES
forType:@"net.sourceforge.bibdesk.bdsksearch.includepassword"];
- }
if (nil == item || NO == [pboard writeObjects:@[item]])
success = [pubs count] > 0;
}
Modified: trunk/bibdesk/NSPasteboard_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSPasteboard_BDSKExtensions.h 2024-01-15 16:58:06 UTC (rev
28611)
+++ trunk/bibdesk/NSPasteboard_BDSKExtensions.h 2024-01-15 17:12:09 UTC (rev
28612)
@@ -55,6 +55,4 @@
@property (nonatomic, readonly) BOOL canReadURL;
- (NSArray *)readURLs;
-@property (nonatomic, readonly) NSURL * pasteLocationURL;
-
@end
Modified: trunk/bibdesk/NSPasteboard_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2024-01-15 16:58:06 UTC (rev
28611)
+++ trunk/bibdesk/NSPasteboard_BDSKExtensions.m 2024-01-15 17:12:09 UTC (rev
28612)
@@ -184,22 +184,4 @@
return URLs;
}
-- (NSURL *)pasteLocationURL {
- NSURL *pasteLocationURL = nil;
- NSString *pasteLocation = [self stringForType:@"com.apple.pastelocation"];
- if (pasteLocation) {
- pasteLocationURL = [NSURL URLWithString:pasteLocation];
- } else {
- PasteboardRef pboardRef = NULL;
- if (noErr == PasteboardCreate((__bridge CFStringRef)[self name],
&pboardRef)) {
- PasteboardSynchronize(pboardRef);
- CFURLRef urlRef = NULL;
- if (noErr == PasteboardCopyPasteLocation(pboardRef, &urlRef))
- pasteLocationURL = CFBridgingRelease(urlRef);
- CFRelease(pboardRef);
- }
- }
- return pasteLocationURL;
-}
-
@end
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
