Revision: 28587
http://sourceforge.net/p/bibdesk/svn/28587
Author: hofman
Date: 2024-01-10 23:14:19 +0000 (Wed, 10 Jan 2024)
Log Message:
-----------
unique string from UUID in NSString category, we always need it as NSString
Modified Paths:
--------------
trunk/bibdesk/BDSKGroup.m
trunk/bibdesk/BDSKScriptHook.m
trunk/bibdesk/BDSKSharingClient.m
trunk/bibdesk/BibItem.m
trunk/bibdesk/CFString_BDSKExtensions.h
trunk/bibdesk/CFString_BDSKExtensions.m
trunk/bibdesk/NSFileManager_BDSKExtensions.m
trunk/bibdesk/NSString_BDSKExtensions.h
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKGroup.m
===================================================================
--- trunk/bibdesk/BDSKGroup.m 2024-01-10 22:46:32 UTC (rev 28586)
+++ trunk/bibdesk/BDSKGroup.m 2024-01-10 23:14:19 UTC (rev 28587)
@@ -41,7 +41,6 @@
#import "BibItem.h"
#import "BDSKStringConstants.h"
#import "NSString_BDSKExtensions.h"
-#import "CFString_BDSKExtensions.h"
#import "BDSKOwnerProtocol.h"
#import "BibDocument.h"
#import "BDSKMacroResolver.h"
@@ -66,7 +65,7 @@
name = [aName copy];
count = 0;
document = nil;
- uniqueID = CFBridgingRelease(BDCreateUniqueString());
+ uniqueID = [NSString uniqueString];
}
return self;
}
@@ -89,7 +88,7 @@
if (self) {
name = [decoder decodeObjectForKey:@"name"];
count = [decoder decodeIntegerForKey:@"count"];
- uniqueID = CFBridgingRelease(BDCreateUniqueString());
+ uniqueID = [NSString uniqueString];
}
return self;
}
Modified: trunk/bibdesk/BDSKScriptHook.m
===================================================================
--- trunk/bibdesk/BDSKScriptHook.m 2024-01-10 22:46:32 UTC (rev 28586)
+++ trunk/bibdesk/BDSKScriptHook.m 2024-01-10 23:14:19 UTC (rev 28587)
@@ -38,7 +38,6 @@
#import "BDSKScriptHook.h"
#import "NSString_BDSKExtensions.h"
-#import "CFString_BDSKExtensions.h"
#import "BDSKStringConstants.h"
#import "NSAppleEventDescriptor_BDSKExtensions.h"
@@ -116,7 +115,7 @@
if (aScript == nil || aName == nil) {
self = nil;
} else {
- uniqueID = CFBridgingRelease(BDCreateUniqueString());
+ uniqueID = [NSString uniqueString];
name = aName;
script = aScript;
field = nil;
Modified: trunk/bibdesk/BDSKSharingClient.m
===================================================================
--- trunk/bibdesk/BDSKSharingClient.m 2024-01-10 22:46:32 UTC (rev 28586)
+++ trunk/bibdesk/BDSKSharingClient.m 2024-01-10 23:14:19 UTC (rev 28587)
@@ -42,7 +42,6 @@
#import "BDSKPasswordController.h"
#import "NSData_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
-#import "CFString_BDSKExtensions.h"
#import "BDSKStringConstants.h"
static NSString *BDSKClientServiceNameForKeychain = @"BibDesk Sharing Access";
@@ -434,7 +433,7 @@
if(uniqueIdentifier == nil){
// use uniqueIdentifier as the notification identifier for
this host on the other end
- uniqueIdentifier = CFBridgingRelease(BDCreateUniqueString());
+ uniqueIdentifier = [NSString uniqueString];
@try {
NSProtocolChecker *checker = [NSProtocolChecker
protocolCheckerWithTarget:self protocol:@protocol(BDSKSharingClient)];
[proxy registerClient:checker
forIdentifier:uniqueIdentifier version:[BDSKAsyncSharingClient
supportedProtocolVersion]];
Modified: trunk/bibdesk/BibItem.m
===================================================================
--- trunk/bibdesk/BibItem.m 2024-01-10 22:46:32 UTC (rev 28586)
+++ trunk/bibdesk/BibItem.m 2024-01-10 23:14:19 UTC (rev 28587)
@@ -120,12 +120,8 @@
@end
static NSURL *createUniqueURL(void)
-{
- CFStringRef uuidStr = BDCreateUniqueString();
- NSURL *identifierURL = [[NSURL alloc] initWithString:[@"bdskidentifier://"
stringByAppendingString:(__bridge NSString *)uuidStr]];
- CFRelease(uuidStr);
- return identifierURL;
-}
+{return [[NSURL alloc] initWithString:[@"bdskidentifier://"
stringByAppendingString:[NSString uniqueString]]];
+}
static NSString *defaultCiteKey = nil;
static NSString *placeholderCiteKey = nil;
Modified: trunk/bibdesk/CFString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/CFString_BDSKExtensions.h 2024-01-10 22:46:32 UTC (rev
28586)
+++ trunk/bibdesk/CFString_BDSKExtensions.h 2024-01-10 23:14:19 UTC (rev
28587)
@@ -63,5 +63,3 @@
{
return (aString == NULL || CFStringCompare(aString, CFSTR(""), 0) ==
kCFCompareEqualTo);
}
-
-CFStringRef BDCreateUniqueString();
Modified: trunk/bibdesk/CFString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/CFString_BDSKExtensions.m 2024-01-10 22:46:32 UTC (rev
28586)
+++ trunk/bibdesk/CFString_BDSKExtensions.m 2024-01-10 23:14:19 UTC (rev
28587)
@@ -979,13 +979,6 @@
__BDReplaceCharactersInCharacterSet(mutableString, charSet, replacement);
}
-CFStringRef BDCreateUniqueString() {
- CFUUIDRef uuid = CFUUIDCreate(NULL);
- CFStringRef uuidStr = CFUUIDCreateString(NULL, uuid);
- CFRelease(uuid);
- return uuidStr;
-}
-
void BDReplaceComposedCharacters(CFMutableStringRef mutableString){
__BDReplaceComposedCharacters(mutableString);
}
Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-10 22:46:32 UTC
(rev 28586)
+++ trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-10 23:14:19 UTC
(rev 28587)
@@ -74,7 +74,6 @@
#import "BDSKVersionNumber.h"
#import "NSError_BDSKExtensions.h"
#import "NSString_BDSKExtensions.h"
-#import "CFString_BDSKExtensions.h"
#import "NSArray_BDSKExtensions.h"
#import <SkimNotesBase/SkimNotesBase.h>
#import <CoreServices/CoreServices.h>
@@ -219,7 +218,7 @@
- (NSURL *)temporaryFileURLWithBasename:(NSString *)fileName {
if (fileName == nil)
- fileName = CFBridgingRelease(BDCreateUniqueString());
+ fileName = [NSString uniqueString];
return [self uniqueFileURLWithName:fileName atURL:[NSURL
fileURLWithPath:temporaryBaseDirectory isDirectory:YES] isDirectory:YES];
}
@@ -284,7 +283,7 @@
return nil;
if ([baseName isEqualToString:@""])
- baseName = CFBridgingRelease(BDCreateUniqueString());
+ baseName = [NSString uniqueString];
NSUInteger i = 0;
NSURL *fileURL = [NSURL fileURLWithPath:[temporaryBaseDirectory
stringByAppendingPathComponent:baseName] isDirectory:YES];
Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h 2024-01-10 22:46:32 UTC (rev
28586)
+++ trunk/bibdesk/NSString_BDSKExtensions.h 2024-01-10 23:14:19 UTC (rev
28587)
@@ -75,6 +75,8 @@
@property (class, nonatomic, readonly) NSString *alternateKeyIndicatorString;
@property (class, nonatomic, readonly) NSString *shiftKeyIndicatorString;
+@property (class, nonatomic, readonly) NSString *uniqueString;
+
/*!
@method hexStringForCharacter:
@abstract Returns the hex value of a unichar (useful for lookups in the
character palette)
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-10 22:46:32 UTC (rev
28586)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-10 23:14:19 UTC (rev
28587)
@@ -154,6 +154,13 @@
return string;
}
++ (NSString *)uniqueString {
+ CFUUIDRef uuid = CFUUIDCreate(NULL);
+ CFStringRef uuidStr = CFUUIDCreateString(NULL, uuid);
+ CFRelease(uuid);
+ return CFBridgingRelease(uuidStr);
+}
+
+ (NSString *)stringWithBool:(BOOL)boolValue {
return boolValue ? @"1" : @"0";
}
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
