Revision: 29874
http://sourceforge.net/p/bibdesk/svn/29874
Author: hofman
Date: 2025-11-22 15:58:00 +0000 (Sat, 22 Nov 2025)
Log Message:
-----------
add some more lightweight generics
Modified Paths:
--------------
trunk/bibdesk/BDSKColorLabelWell.h
trunk/bibdesk/BDSKColorLabelWell.m
trunk/bibdesk/BDSKDOIParser.h
trunk/bibdesk/BDSKDOIParser.m
trunk/bibdesk/BDSKSearchGroup.h
trunk/bibdesk/BDSKSearchGroup.m
trunk/bibdesk/BDSKTemplateDocument.h
trunk/bibdesk/BDSKWebGroup.h
trunk/bibdesk/BDSKWebGroup.m
trunk/bibdesk/NSString_BDSKExtensions.h
trunk/bibdesk/NSTask_BDSKExtensions.h
Modified: trunk/bibdesk/BDSKColorLabelWell.h
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.h 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKColorLabelWell.h 2025-11-22 15:58:00 UTC (rev 29874)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface BDSKColorLabelWell : NSColorWell {
- NSArray *buttons;
+ NSArray<NSButton *> *buttons;
BOOL suppressColor;
BOOL suppressSelection;
NSTextFieldCell *titleCell;
Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKColorLabelWell.m 2025-11-22 15:58:00 UTC (rev 29874)
@@ -307,7 +307,7 @@
unichar ch = [event firstCharacter];
if (ch == NSRightArrowFunctionKey ||
([self enclosingMenuItem] && ch == NSTabCharacter)) {
- NSUInteger i = [buttons indexOfObject:[[self window] firstResponder]
?: [NSNull null]];
+ NSUInteger i = NSNotFound;[buttons indexOfObject:(id)[[self window]
firstResponder] ?: (id)[NSNull null]];
if (i == NSNotFound)
i = 0;
else if (i < 8)
@@ -317,7 +317,7 @@
[[self window] makeFirstResponder:[buttons objectAtIndex:i]];
} else if (ch == NSLeftArrowFunctionKey ||
([self enclosingMenuItem] && ch == NSBackTabCharacter)) {
- NSUInteger i = [buttons indexOfObject:[[self window] firstResponder]
?: [NSNull null]];
+ NSUInteger i = [buttons indexOfObject:(id)[[self window]
firstResponder] ?: (id)[NSNull null]];
if (i == NSNotFound)
i = 8;
else if (i > 0)
Modified: trunk/bibdesk/BDSKDOIParser.h
===================================================================
--- trunk/bibdesk/BDSKDOIParser.h 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKDOIParser.h 2025-11-22 15:58:00 UTC (rev 29874)
@@ -43,7 +43,7 @@
@interface BDSKDOIParser : NSObject <BDSKStringParser>
+ (nullable NSArray<BibItem *> *)itemsFromString:(NSString *)itemString
owner:(nullable id<BDSKOwner>)owner error:(NSError **)outError;
-+ (void)itemsFromString:(NSString *)itemString owner:(id<BDSKOwner>)owner
completionHandler:(void (^ _Nullable)(NSArray *publications))completionHandler;
++ (void)itemsFromString:(NSString *)itemString owner:(id<BDSKOwner>)owner
completionHandler:(void (^ _Nullable)(NSArray<BibItem *> * _Nullable
publications))completionHandler;
@end
NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKDOIParser.m
===================================================================
--- trunk/bibdesk/BDSKDOIParser.m 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKDOIParser.m 2025-11-22 15:58:00 UTC (rev 29874)
@@ -107,7 +107,7 @@
return items;
}
-+ (void)itemsFromString:(NSString *)itemString owner:(id<BDSKOwner>)owner
completionHandler:(void (^)(NSArray *publications))completionHandler {
++ (void)itemsFromString:(NSString *)itemString owner:(id<BDSKOwner>)owner
completionHandler:(void (^)(NSArray<BibItem *> *publications))completionHandler
{
NSURLRequest *request = [self requestForDOIString:itemString];
[[BDSKDownloader sharedDownloader] downloadDataWithRequest:request
completionHandler:^(NSData *data, NSURLResponse *response, NSError *error){
completionHandler([self itemsFromData:data encodingName:[response
textEncodingName] owner:owner]);
Modified: trunk/bibdesk/BDSKSearchGroup.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.h 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKSearchGroup.h 2025-11-22 15:58:00 UTC (rev 29874)
@@ -103,15 +103,15 @@
NSArray<BibItem *> *publications;
id<BDSKSearchGroupServer> server;
BOOL importFinished;
- void(^completionHandler)(NSArray *);
+ void(^completionHandler)(NSArray<BibItem *> *);
id strongSelf;
}
-+ (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray * _Nullable
publications))completionHandler;
++ (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray<BibItem *> * _Nullable
publications))completionHandler;
- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver
NS_DESIGNATED_INITIALIZER;
- (instancetype)init NS_UNAVAILABLE;
-- (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo completionHandler:(void(^)(NSArray
*publications))aCompletionHandler;
+- (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo
completionHandler:(void(^)(NSArray<BibItem *> * _Nullable
publications))aCompletionHandler;
@end
Modified: trunk/bibdesk/BDSKSearchGroup.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.m 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKSearchGroup.m 2025-11-22 15:58:00 UTC (rev 29874)
@@ -431,7 +431,7 @@
return self;
}
-+ (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray
*publications))completionHandler {
++ (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray<BibItem *>
*publications))completionHandler {
if (serverInfo == nil) {
serverInfo = [[BDSKServerInfo alloc]
initWithType:BDSKSearchGroupEntrez name:@"PubMed" database:@"pubmed" host:nil
port:nil options:nil];
}
@@ -439,7 +439,7 @@
[search searchUsingSearchTerm:searchTerm serverInfo:serverInfo
completionHandler:completionHandler];
}
-- (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo completionHandler:(void(^)(NSArray
*publications))aCompletionHandler {
+- (void)searchUsingSearchTerm:(NSString *)searchTerm
serverInfo:(BDSKServerInfo *)serverInfo
completionHandler:(void(^)(NSArray<BibItem *> *publications))aCompletionHandler
{
server = [BDSKSearchGroup copyServerWithGroup:self serverInfo:serverInfo];
completionHandler = [aCompletionHandler copy];
Modified: trunk/bibdesk/BDSKTemplateDocument.h
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.h 2025-11-22 15:34:48 UTC (rev
29873)
+++ trunk/bibdesk/BDSKTemplateDocument.h 2025-11-22 15:58:00 UTC (rev
29874)
@@ -144,7 +144,7 @@
@property (nonatomic, nullable, strong) IBOutlet NSView *textOptionsView;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *fieldField;
@property (nonatomic, nullable, strong) IBOutlet NSComboBox *sizeComboBox;
-@property (nonatomic, nullable, strong) IBOutlet NSArray *optionControls;
+@property (nonatomic, nullable, strong) IBOutlet NSArray<NSArray<NSView *> *>
*optionControls;
@property (nonatomic, readonly) NSArray<BDSKTypeTemplate *> *typeTemplates;
Modified: trunk/bibdesk/BDSKWebGroup.h
===================================================================
--- trunk/bibdesk/BDSKWebGroup.h 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKWebGroup.h 2025-11-22 15:58:00 UTC (rev 29874)
@@ -66,11 +66,11 @@
@interface BDSKWebSearch : NSObject {
BDSKWebGroup *group;
BDSKMacroResolver *macroResolver;
- void(^completionHandler)(NSArray *);
+ void(^completionHandler)(NSArray<BibItem *> *);
id strongSelf;
}
-+ (void)searchItemsFromURL:(NSURL *)aURL macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray * _Nullable
publications))completionHandler;
++ (void)searchItemsFromURL:(NSURL *)aURL macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray<BibItem *> * _Nullable
publications))completionHandler;
@end
Modified: trunk/bibdesk/BDSKWebGroup.m
===================================================================
--- trunk/bibdesk/BDSKWebGroup.m 2025-11-22 15:34:48 UTC (rev 29873)
+++ trunk/bibdesk/BDSKWebGroup.m 2025-11-22 15:58:00 UTC (rev 29874)
@@ -421,7 +421,7 @@
[self handleGroupUpdatedNotification:nil];
}
-+ (void)searchItemsFromURL:(NSURL *)aURL macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray
*publications))completionHandler {
++ (void)searchItemsFromURL:(NSURL *)aURL macroResolver:(BDSKMacroResolver
*)macroResolver completionHandler:(void(^)(NSArray<BibItem *>
*publications))completionHandler {
BDSKWebSearch *search = [[self alloc] initWithMacroResolver:macroResolver];
[search searchItemsFromURL:aURL completionHandler:completionHandler];
}
Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h 2025-11-22 15:34:48 UTC (rev
29873)
+++ trunk/bibdesk/NSString_BDSKExtensions.h 2025-11-22 15:58:00 UTC (rev
29874)
@@ -293,7 +293,7 @@
@property (nonatomic, readonly) NSString *stringByConvertingHTMLToTeX;
+ (NSString *)TeXStringWithHTMLString:(NSString *)htmlString;
-@property (nonatomic, readonly) NSArray *sourceLinesBySplittingString;
+@property (nonatomic, readonly) NSArray<NSString *>
*sourceLinesBySplittingString;
@property (nonatomic, readonly) NSString *stringByEscapingGroupPlistEntities;
@property (nonatomic, readonly) NSString *stringByUnescapingGroupPlistEntities;
@@ -394,7 +394,7 @@
@param trim (description)
@result (description)
*/
-- (NSArray *)componentsSeparatedByCharactersInSet:(NSCharacterSet *)charSet
trimWhitespace:(BOOL)trim;
+- (NSArray<NSString *> *)componentsSeparatedByCharactersInSet:(NSCharacterSet
*)charSet trimWhitespace:(BOOL)trim;
/*!
@method componentsSeparatedByStringCaseInsensitive:
@@ -404,10 +404,10 @@
@result (description)
*/
-@property (nonatomic, readonly) NSArray *componentsSeparatedByAnd;
-@property (nonatomic, readonly) NSArray *componentsSeparatedByComma;
+@property (nonatomic, readonly) NSArray<NSString *> *componentsSeparatedByAnd;
+@property (nonatomic, readonly) NSArray<NSString *>
*componentsSeparatedByComma;
-@property (nonatomic, readonly) NSArray *componentsSeparatedByFieldSeparators;
+@property (nonatomic, readonly) NSArray<NSString *>
*componentsSeparatedByFieldSeparators;
- (NSIndexSet *)indexesOfCharactersInSet:(NSCharacterSet *)charSet;
@@ -510,7 +510,7 @@
#pragma mark Script arguments
-@property (nonatomic, readonly) NSArray *shellScriptArgumentsArray;
+@property (nonatomic, readonly) NSArray<NSString *> *shellScriptArgumentsArray;
@property (nonatomic, readonly) NSArray *appleScriptArgumentsArray;
#pragma mark Some convenience keys for templates
Modified: trunk/bibdesk/NSTask_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSTask_BDSKExtensions.h 2025-11-22 15:34:48 UTC (rev
29873)
+++ trunk/bibdesk/NSTask_BDSKExtensions.h 2025-11-22 15:58:00 UTC (rev
29874)
@@ -41,9 +41,9 @@
NS_ASSUME_NONNULL_BEGIN
@interface NSTask (BDSKExtensions)
-+ (nullable NSString *)outputStringFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray *)args inputString:(NSString *)input;
-+ (nullable NSData *)outputDataFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray *)args inputString:(NSString *)input;
-+ (nullable NSData *)outputDataFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray *)args inputData:(NSData *)input;
++ (nullable NSString *)outputStringFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray<NSString *> *)args inputString:(NSString *)input;
++ (nullable NSData *)outputDataFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray<NSString *> *)args inputString:(NSString *)input;
++ (nullable NSData *)outputDataFromTaskWithLaunchPath:(NSString *)cmd
arguments:(nullable NSArray<NSString *> *)args inputData:(NSData *)input;
@end
NS_ASSUME_NONNULL_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
