Revision: 29869
http://sourceforge.net/p/bibdesk/svn/29869
Author: hofman
Date: 2025-11-21 22:50:30 +0000 (Fri, 21 Nov 2025)
Log Message:
-----------
add lightweight generics to categories
Modified Paths:
--------------
trunk/bibdesk/BDSKAppController+Scripting.h
trunk/bibdesk/BDSKBookmark+Scripting.h
trunk/bibdesk/BDSKField.h
trunk/bibdesk/BDSKGroup+Scripting.h
trunk/bibdesk/BDSKMacroResolver+Scripting.h
trunk/bibdesk/BDSKScriptHook+Scripting.h
trunk/bibdesk/BDSKSearchBookmark+Scripting.h
trunk/bibdesk/BDSKServerInfo+Scripting.h
trunk/bibdesk/BDSKTypeInfo.h
trunk/bibdesk/BibAuthor+Scripting.h
trunk/bibdesk/BibDocument+Scripting.h
trunk/bibdesk/BibItem+Scripting.h
trunk/bibdesk/DOMNode_BDSKExtensions.h
trunk/bibdesk/NSArray_BDSKExtensions.h
trunk/bibdesk/NSAttributedString_BDSKExtensions.h
trunk/bibdesk/NSColor_BDSKExtensions.h
trunk/bibdesk/NSFileManager_BDSKExtensions.h
trunk/bibdesk/NSPasteboard_BDSKExtensions.h
trunk/bibdesk/NSPrintOperation_BDSKExtensions.h
trunk/bibdesk/NSString_BDSKExtensions.h
trunk/bibdesk/NSTextView_BDSKExtensions.h
trunk/bibdesk/NSURL_BDSKExtensions.h
trunk/bibdesk/NSWorkspace_BDSKExtensions.h
Modified: trunk/bibdesk/BDSKAppController+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKAppController+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BDSKAppController+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -50,9 +50,9 @@
@property (nonatomic, readonly) NSString *citeKeyFormat;
@property (nonatomic, readonly) NSString *localFileFormat;
-@property (nonatomic, readonly) NSArray *allTypes;
+@property (nonatomic, readonly) NSArray<NSString *> *allTypes;
-@property (nonatomic, readonly) NSArray *allFieldNames;
+@property (nonatomic, readonly) NSArray<NSString *> *allFieldNames;
@property (nonatomic, readonly) id clipboard;
@@ -59,17 +59,17 @@
- (nullable BDSKScriptHook *)valueInScriptHooksWithUniqueID:(NSString
*)uniqueID;
- (BDSKMacro *)valueInMacrosWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *macros;
+@property (nonatomic, readonly) NSArray<BDSKMacro *> *macros;
-@property (nonatomic, readonly) NSArray *bookmarks;
+@property (nonatomic, readonly) NSArray<BDSKBookmark *> *bookmarks;
- (void)insertObject:(BDSKBookmark *)bookmark
inBookmarksAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromBookmarksAtIndex:(NSUInteger)anIndex;
-@property (nonatomic, readonly) NSArray *searchBookmarks;
+@property (nonatomic, readonly) NSArray<BDSKSearchBookmark *> *searchBookmarks;
- (void)insertObject:(BDSKSearchBookmark *)bookmark
inSearchBookmarksAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromSearchBookmarksAtIndex:(NSUInteger)anIndex;
-@property (nonatomic, readonly) NSArray *templateNames;
+@property (nonatomic, readonly) NSArray<NSString *> *templateNames;
- (BOOL)application:(NSApplication *)sender delegateHandlesKey:(NSString *)key;
@@ -78,16 +78,16 @@
@interface NSObject (Scripting)
- (BDSKTypeInfo *)valueInTypeInfosWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *typeInfos;
+@property (nonatomic, readonly) NSArray<BDSKTypeInfo *> *typeInfos;
- (BDSKFieldInfo *)valueInFieldInfosWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *fieldInfos;
+@property (nonatomic, readonly) NSArray<BDSKFieldInfo *> *fieldInfos;
- (BDSKTemplate *)valueInTemplatesWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *templates;
+@property (nonatomic, readonly) NSArray<BDSKTemplate *> *templates;
- (BDSKServerInfo *)valueInServerInfosWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *serverInfos;
+@property (nonatomic, readonly) NSArray<BDSKServerInfo *> *serverInfos;
@end
Modified: trunk/bibdesk/BDSKBookmark+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKBookmark+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BDSKBookmark+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -47,9 +47,9 @@
@property (nonatomic, nullable, readonly) BDSKBookmark *scriptingParent;
-@property (nonatomic, readonly) NSArray *entireContents;
+@property (nonatomic, readonly) NSArray<BDSKBookmark *> *entireContents;
-@property (nonatomic, readonly) NSArray *bookmarks;
+@property (nonatomic, readonly) NSArray<BDSKBookmark *> *bookmarks;
- (void)insertObject:(BDSKBookmark *)bookmark
inBookmarksAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromBookmarksAtIndex:(NSUInteger)anIndex;
Modified: trunk/bibdesk/BDSKField.h
===================================================================
--- trunk/bibdesk/BDSKField.h 2025-11-21 17:45:19 UTC (rev 29868)
+++ trunk/bibdesk/BDSKField.h 2025-11-21 22:50:30 UTC (rev 29869)
@@ -68,10 +68,10 @@
@property (nonatomic, readonly, getter=isInherited) BOOL inherited;
-@property (nonatomic, nullable, readonly) NSArray *scriptingAuthors;
+@property (nonatomic, nullable, readonly) NSArray<BibAuthor *>
*scriptingAuthors;
- (nullable BibAuthor *)valueInScriptingAuthorsWithName:(NSString *)aName;
-@property (nonatomic, nullable, readonly) NSArray *scriptingPublications;
+@property (nonatomic, nullable, readonly) NSArray<BibItem *>
*scriptingPublications;
@end
Modified: trunk/bibdesk/BDSKGroup+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKGroup+Scripting.h 2025-11-21 17:45:19 UTC (rev 29868)
+++ trunk/bibdesk/BDSKGroup+Scripting.h 2025-11-21 22:50:30 UTC (rev 29869)
@@ -56,16 +56,16 @@
@interface BDSKGroup (Scripting)
- (nullable id)valueInScriptingPublicationsWithUniqueID:(NSString *)uniqueID;
-@property (nonatomic, readonly) NSArray *scriptingPublications;
+@property (nonatomic, readonly) NSArray<BibItem *> *scriptingPublications;
-@property (nonatomic, readonly) NSArray *authors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *authors;
- (nullable BibAuthor *)valueInAuthorsWithName:(NSString *)aName;
-@property (nonatomic, readonly) NSArray *editors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *editors;
- (nullable BibAuthor *)valueInEditorsWithName:(NSString *)aName;
- (BDSKMacro *)valueInMacrosWithName:(NSString *)aName;
-@property (nonatomic, readonly) NSArray *macros;
+@property (nonatomic, readonly) NSArray<BDSKMacro *> *macros;
@property (nonatomic, readonly) NSString *scriptingName;
@@ -110,7 +110,7 @@
@interface BDSKSmartGroup (Scripting)
-@property (nonatomic, readonly) NSArray *conditions;
+@property (nonatomic, readonly) NSArray<BDSKCondition *> *conditions;
- (void)insertObject:(BDSKCondition *)condition
inConditionsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromConditionsAtIndex:(NSUInteger)idx;
@@ -166,7 +166,7 @@
@property (nonatomic, nullable, strong) NSString *scriptingSearchTerm;
-@property (nonatomic, copy) NSDictionary *scriptingServerInfo;
+@property (nonatomic, copy) NSDictionary<NSString *, id> *scriptingServerInfo;
@property (nonatomic, readonly) NSString *scriptingServerType;
Modified: trunk/bibdesk/BDSKMacroResolver+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKMacroResolver+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BDSKMacroResolver+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -48,7 +48,7 @@
@interface BDSKMacroResolver (Scripting)
- (BDSKMacro *)valueInMacrosWithName:(NSString *)aName;
-@property (nonatomic, readonly) NSArray *macros;
+@property (nonatomic, readonly) NSArray<BDSKMacro *> *macros;
@end
Modified: trunk/bibdesk/BDSKScriptHook+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKScriptHook+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BDSKScriptHook+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -43,8 +43,8 @@
@interface BDSKScriptHook (Scripting)
@property (nonatomic, nullable, readonly) NSString *scriptingField;
-@property (nonatomic, nullable, readonly) NSArray *scriptingOldValues;
-@property (nonatomic, nullable, readonly) NSArray *scriptingNewValues;
+@property (nonatomic, nullable, readonly) NSArray<NSString *>
*scriptingOldValues;
+@property (nonatomic, nullable, readonly) NSArray<NSString *>
*scriptingNewValues;
@end
Modified: trunk/bibdesk/BDSKSearchBookmark+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark+Scripting.h 2025-11-21 17:45:19 UTC
(rev 29868)
+++ trunk/bibdesk/BDSKSearchBookmark+Scripting.h 2025-11-21 22:50:30 UTC
(rev 29869)
@@ -49,9 +49,9 @@
@property (nonatomic, nullable, readonly) BDSKSearchBookmark *scriptingParent;
-@property (nonatomic, readonly) NSArray *entireContents;
+@property (nonatomic, readonly) NSArray<BDSKSearchBookmark *> *entireContents;
-@property (nonatomic, readonly) NSArray *searchBookmarks;
+@property (nonatomic, readonly) NSArray<BDSKSearchBookmark *> *searchBookmarks;
- (void)insertObject:(BDSKSearchBookmark *)bookmark
inSearchBookmarksAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromSearchBookmarksAtIndex:(NSUInteger)anIndex;
Modified: trunk/bibdesk/BDSKServerInfo+Scripting.h
===================================================================
--- trunk/bibdesk/BDSKServerInfo+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BDSKServerInfo+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -45,11 +45,11 @@
@property (nonatomic, nullable, readonly) NSScriptObjectSpecifier
*objectSpecifier;
-@property (nonatomic, readonly) NSDictionary *scriptingServerInfo;
+@property (nonatomic, readonly) NSDictionary<NSString *, id>
*scriptingServerInfo;
@property (nonatomic, readonly) NSString *scriptingName;
-+ (BDSKServerInfo *)newServerInfo:(nullable BDSKServerInfo *)serverInfo
withScriptingServerInfo:(NSDictionary *)info;
++ (BDSKServerInfo *)newServerInfo:(nullable BDSKServerInfo *)serverInfo
withScriptingServerInfo:(NSDictionary<NSString *, id> *)info;
@end
Modified: trunk/bibdesk/BDSKTypeInfo.h
===================================================================
--- trunk/bibdesk/BDSKTypeInfo.h 2025-11-21 17:45:19 UTC (rev 29868)
+++ trunk/bibdesk/BDSKTypeInfo.h 2025-11-21 22:50:30 UTC (rev 29869)
@@ -49,8 +49,8 @@
@property (nonatomic, readonly) NSString *name;
-@property (nonatomic, readonly) NSArray *requiredFieldNames;
-@property (nonatomic, readonly) NSArray *optionalFieldNames;
+@property (nonatomic, readonly) NSArray<NSString *> *requiredFieldNames;
+@property (nonatomic, readonly) NSArray<NSString *> *optionalFieldNames;
@property (nonatomic, readonly, getter=isStandard) BOOL standard;
Modified: trunk/bibdesk/BibAuthor+Scripting.h
===================================================================
--- trunk/bibdesk/BibAuthor+Scripting.h 2025-11-21 17:45:19 UTC (rev 29868)
+++ trunk/bibdesk/BibAuthor+Scripting.h 2025-11-21 22:50:30 UTC (rev 29869)
@@ -43,13 +43,13 @@
@interface BibAuthor (Scripting)
-+ (nullable NSArray *)authorsInPublications:(NSArray *)publications;
-+ (nullable BibAuthor *)authorWithName:(NSString *)aName
inPublications:(NSArray *)publications;
++ (nullable NSArray<BibAuthor *> *)authorsInPublications:(NSArray
*)publications;
++ (nullable BibAuthor *)authorWithName:(NSString *)aName
inPublications:(NSArray<BibItem *> *)publications;
-+ (nullable NSArray *)editorsInPublications:(NSArray *)publications;
-+ (nullable BibAuthor *)editorWithName:(NSString *)aName
inPublications:(NSArray *)publications;
++ (nullable NSArray<BibAuthor *> *)editorsInPublications:(NSArray<BibItem *>
*)publications;
++ (nullable BibAuthor *)editorWithName:(NSString *)aName
inPublications:(NSArray<BibItem *> *)publications;
-@property (nonatomic, readonly) NSArray *scriptingPublications;
+@property (nonatomic, readonly) NSArray<BibItem *> *scriptingPublications;
@property (nonatomic, readonly, getter=isExternal) BOOL external;
Modified: trunk/bibdesk/BibDocument+Scripting.h
===================================================================
--- trunk/bibdesk/BibDocument+Scripting.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/BibDocument+Scripting.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -45,81 +45,81 @@
@interface BibDocument (Scripting)
- (nullable id)valueInScriptingPublicationsWithUniqueID:(NSString *)uniqueID;
-@property (nonatomic, readonly) NSArray *scriptingPublications;
+@property (nonatomic, readonly) NSArray<BibItem *> *scriptingPublications;
- (void)insertObject:(BibItem *)pub
inScriptingPublicationsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromScriptingPublicationsAtIndex:(NSUInteger)idx;
- (BDSKMacro *)valueInMacrosWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *macros;
+@property (nonatomic, readonly) NSArray<BDSKMacro *> *macros;
- (BDSKInfo *)valueInInfosWithName:(NSString *)aName;
-@property (nonatomic, readonly) NSArray *infos;
+@property (nonatomic, readonly) NSArray<BDSKInfo *> *infos;
-@property (nonatomic, readonly) NSArray *authors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *authors;
- (nullable BibAuthor *)valueInAuthorsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *editors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *editors;
- (nullable BibAuthor *)valueInEditorsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *scriptingGroups;
+@property (nonatomic, readonly) NSArray<BDSKGroup *> *scriptingGroups;
- (nullable BDSKGroup *)valueInScriptingGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKGroup *)valueInScriptingGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKGroup *)group
inScriptingGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromScriptingGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *staticGroups;
+@property (nonatomic, readonly) NSArray<BDSKStaticGroup *> *staticGroups;
- (nullable BDSKStaticGroup *)valueInStaticGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKStaticGroup *)valueInStaticGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKStaticGroup *)group
inStaticGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromStaticGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *smartGroups;
+@property (nonatomic, readonly) NSArray<BDSKSmartGroup *> *smartGroups;
- (nullable BDSKSmartGroup *)valueInSmartGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKSmartGroup *)valueInSmartGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKSmartGroup *)group
inSmartGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromSmartGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *fieldGroups;
+@property (nonatomic, readonly) NSArray<BDSKCategoryGroup *> *fieldGroups;
- (nullable BDSKCategoryGroup *)valueInFieldGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKCategoryGroup *)valueInFieldGroupsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *externalFileGroups;
+@property (nonatomic, readonly) NSArray<BDSKURLGroup *> *externalFileGroups;
- (nullable BDSKURLGroup *)valueInExternalFileGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKURLGroup *)valueInExternalFileGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKURLGroup *)group
inExternalFileGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromExternalFileGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *scriptGroups;
+@property (nonatomic, readonly) NSArray<BDSKScriptGroup *> *scriptGroups;
- (nullable BDSKScriptGroup *)valueInScriptGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKScriptGroup *)valueInScriptGroupsWithName:(NSString *)name;
- (void)removeObjectFromScriptGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *webGroups;
+@property (nonatomic, readonly) NSArray<BDSKWebGroup *> *webGroups;
- (nullable BDSKWebGroup *)valueInWebGroupsWithUniqueID:(NSString *)aUniqueID;
- (nullable BDSKWebGroup *)valueInWebGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKWebGroup *)group inWebGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromWebGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *searchGroups;
+@property (nonatomic, readonly) NSArray<BDSKSearchGroup *> *searchGroups;
- (nullable BDSKSearchGroup *)valueInSearchGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKSearchGroup *)valueInSearchGroupsWithName:(NSString *)name;
- (void)insertObject:(BDSKSearchGroup *)group
inSearchGroupsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromSearchGroupsAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *sharedGroups;
+@property (nonatomic, readonly) NSArray<BDSKSharedGroup *> *sharedGroups;
- (nullable BDSKSharedGroup *)valueInSharedGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKSharedGroup *)valueInSharedGroupsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *libraryGroups;
+@property (nonatomic, readonly) NSArray<BDSKLibraryGroup *> *libraryGroups;
- (nullable BDSKGroup *)valueInLibraryGroupsWithUniqueID:(NSString *)aUniqueID;
- (nullable BDSKGroup *)valueInLibraryGroupsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *lastImportGroups;
+@property (nonatomic, readonly) NSArray<BDSKLastImportGroup *>
*lastImportGroups;
- (nullable BDSKGroup *)valueInLastImportGroupsWithUniqueID:(NSString
*)aUniqueID;
- (nullable BDSKGroup *)valueInLastImportGroupsWithName:(NSString *)name;
-@property (nonatomic, nullable, copy) NSArray *selection;
-@property (nonatomic, nullable, copy) NSArray *groupSelection;
+@property (nonatomic, nullable, copy) NSArray<BibItem *> *selection;
+@property (nonatomic, nullable, copy) NSArray<BDSKGroup *> *groupSelection;
- (nullable id)handleExportScriptCommand:(NSScriptCommand *)command;
- (nullable id)handleImportScriptCommand:(NSScriptCommand *)command;
Modified: trunk/bibdesk/BibItem+Scripting.h
===================================================================
--- trunk/bibdesk/BibItem+Scripting.h 2025-11-21 17:45:19 UTC (rev 29868)
+++ trunk/bibdesk/BibItem+Scripting.h 2025-11-21 22:50:30 UTC (rev 29869)
@@ -44,19 +44,19 @@
@interface BibItem (Scripting)
- (nullable BDSKField *)valueInBibFieldsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *bibFields;
+@property (nonatomic, readonly) NSArray<BDSKField *> *bibFields;
-@property (nonatomic, readonly) NSArray *scriptingAuthors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *scriptingAuthors;
- (BibAuthor*)valueInScriptingAuthorsWithName:(NSString*)name;
-@property (nonatomic, readonly) NSArray *scriptingEditors;
+@property (nonatomic, readonly) NSArray<BibAuthor *> *scriptingEditors;
- (nullable BibAuthor *)valueInScriptingEditorsWithName:(NSString *)name;
-@property (nonatomic, readonly) NSArray *linkedFiles;
+@property (nonatomic, readonly) NSArray<NSURL *> *linkedFiles;
- (void)insertObject:(NSURL *)newURL inLinkedFilesAtIndex:(NSUInteger)idx;
- (void)removeObjectFromLinkedFilesAtIndex:(NSUInteger)idx;
-@property (nonatomic, readonly) NSArray *linkedURLs;
+@property (nonatomic, readonly) NSArray<NSString *> *linkedURLs;
- (void)insertObject:(NSString *)newURLString
inLinkedURLsAtIndex:(NSUInteger)idx;
- (void)removeObjectFromLinkedURLsAtIndex:(NSUInteger)idx;
Modified: trunk/bibdesk/DOMNode_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/DOMNode_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/DOMNode_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -43,9 +43,9 @@
@interface DOMNode (BDSKExtensions)
-- (nullable NSArray *)nodesForXPath:(NSString *)xpath;
+- (nullable NSArray<DOMNode *> *)nodesForXPath:(NSString *)xpath;
- (nullable DOMNode *)singleNodeForXPath:(NSString *)xpath;
-- (nullable NSArray *)nodesForXPathExpression:(DOMXPathExpression
*)xpathExpression;
+- (nullable NSArray<DOMNode *> *)nodesForXPathExpression:(DOMXPathExpression
*)xpathExpression;
- (nullable DOMNode *)singleNodeForXPathExpression:(DOMXPathExpression
*)xpathExpression;
@property (nonatomic, nullable, readonly) NSString *textString;
Modified: trunk/bibdesk/NSArray_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSArray_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSArray_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -90,8 +90,8 @@
@property (nonatomic, readonly) NSString
*componentsJoinedByCommaWithEtAlAfterSix;
@property (nonatomic, readonly) NSString *prefixesJoinedWithPlusAfterThree;
-@property (nonatomic, readonly) NSArray *indexRanges;
-@property (nonatomic, readonly) NSArray *indexRangeStrings;
+@property (nonatomic, readonly) NSArray<NSArray<NSNumber *> *> *indexRanges;
+@property (nonatomic, readonly) NSArray<NSString *> *indexRangeStrings;
- (NSArray *)arrayByRemovingObject:(id)anObject;
@@ -98,7 +98,7 @@
- (NSIndexSet *)indexesOfObjectsIdenticalTo:(NSArray *)objects;
- (NSArray *)objectsAtIndexSpecifiers:(NSArray *)indexes;
-- (id)sortedArrayUsingMergesortWithDescriptors:(NSArray *)sortDescriptors;
+- (id)sortedArrayUsingMergesortWithDescriptors:(NSArray<NSSortDescriptor *>
*)sortDescriptors;
@end
@@ -108,7 +108,7 @@
- (void)sortUsingSelector:(SEL)comparator ascending:(BOOL)ascend;
-- (void)mergeSortUsingDescriptors:(NSArray *)sortDescriptors;
+- (void)mergeSortUsingDescriptors:(NSArray<NSSortDescriptor *>
*)sortDescriptors;
@end
Modified: trunk/bibdesk/NSAttributedString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2025-11-21 17:45:19 UTC
(rev 29868)
+++ trunk/bibdesk/NSAttributedString_BDSKExtensions.h 2025-11-21 22:50:30 UTC
(rev 29869)
@@ -44,7 +44,7 @@
- (instancetype)initWithString:(NSString *)string attributeName:(NSString
*)attributeName attributeValue:(id)attributeValue;
-- (instancetype)initWithTeXString:(NSString *)string attributes:(NSDictionary
*)attributes collapseWhitespace:(BOOL)collapse;
+- (instancetype)initWithTeXString:(NSString *)string
attributes:(NSDictionary<NSString *, id> *)attributes
collapseWhitespace:(BOOL)collapse;
-
(NSComparisonResult)localizedCaseInsensitiveNonTeXNonArticleCompare:(NSAttributedString
*)other;
@@ -56,7 +56,7 @@
@interface NSMutableAttributedString (BDSKExtensions)
-- (void)appendString:(NSString *)string attributes:(NSDictionary *)attributes;
+- (void)appendString:(NSString *)string attributes:(NSDictionary<NSString *,
id> *)attributes;
- (BOOL)addTextColorAttribute;
- (BOOL)removeTextColorAttribute;
Modified: trunk/bibdesk/NSColor_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSColor_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -61,8 +61,8 @@
@property (class, nonatomic, readonly) NSColor *searchHighlightColor;
-@property (class, nonatomic, readonly) NSArray *labelColors;
-@property (class, nonatomic, readonly) NSArray *labelNames;
+@property (class, nonatomic, readonly) NSArray<NSColor *> *labelColors;
+@property (class, nonatomic, readonly) NSArray<NSString *> *labelNames;
+ (NSColor *)colorWithFourByteString:(NSString *)string;
@property (nonatomic, readonly) NSString *fourByteStringValue;
Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSFileManager_BDSKExtensions.h 2025-11-21 17:45:19 UTC
(rev 29868)
+++ trunk/bibdesk/NSFileManager_BDSKExtensions.h 2025-11-21 22:50:30 UTC
(rev 29869)
@@ -108,7 +108,7 @@
- (BOOL)setAppleStringEncoding:(NSStringEncoding)nsEncoding atURL:(NSURL
*)fileURL error:(NSError **)error;
// uses createDirectoryAtPath:withIntermediateDirectories:attributes:error:
for the containing directory if necessary
-- (BOOL)createPathToURL:(NSURL *)fileURL attributes:(nullable NSDictionary
*)attributes;
+- (BOOL)createPathToURL:(NSURL *)fileURL attributes:(nullable
NSDictionary<NSString *, id> *)attributes;
@end
Modified: trunk/bibdesk/NSPasteboard_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSPasteboard_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSPasteboard_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -48,14 +48,14 @@
@interface NSPasteboard (BDSKExtensions)
-- (BOOL)writeURLs:(NSArray *)URLs names:(nullable NSArray *)names;
-- (nullable NSArray *)readURLNames;
+- (BOOL)writeURLs:(NSArray<NSURL *> *)URLs names:(nullable NSArray<NSString *>
*)names;
+- (nullable NSArray<NSURL *> *)readURLNames;
-- (BOOL)canReadFileURLOfTypes:(nullable NSArray *)types;
-- (nullable NSArray *)readFileURLsOfTypes:(nullable NSArray *)types;
+- (BOOL)canReadFileURLOfTypes:(nullable NSArray<NSString *> *)types;
+- (nullable NSArray<NSURL *> *)readFileURLsOfTypes:(nullable NSArray<NSString
*> *)types;
@property (nonatomic, readonly) BOOL canReadURL;
-- (nullable NSArray *)readURLs;
+- (nullable NSArray<NSURL *> *)readURLs;
@end
Modified: trunk/bibdesk/NSPrintOperation_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSPrintOperation_BDSKExtensions.h 2025-11-21 17:45:19 UTC
(rev 29868)
+++ trunk/bibdesk/NSPrintOperation_BDSKExtensions.h 2025-11-21 22:50:30 UTC
(rev 29869)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface NSPrintOperation (BDSKExtensions)
-+ (NSPrintOperation *)printOperationWithAttributedString:(NSAttributedString
*)attributedString printInfo:(NSPrintInfo *)printInfo settings:(nullable
NSDictionary *)printSettings;
++ (NSPrintOperation *)printOperationWithAttributedString:(NSAttributedString
*)attributedString printInfo:(NSPrintInfo *)printInfo settings:(nullable
NSDictionary<NSString *, id> *)printSettings;
@end
NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSString_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -494,7 +494,7 @@
@property (nonatomic, readonly) NSString *stringByRemovingAliens;
@property (class, nonatomic, readonly) NSString *pathSeparator;
-+ (NSString *)commonRootPathOfFiles:(NSArray *)filenames;
++ (NSString *)commonRootPathOfFiles:(NSArray<NSString *> *)filenames;
- (NSString *)relativePathFromPath:(NSString *)basePath;
@property (nonatomic, readonly) NSString *stringByNormalizingPath;
@@ -521,7 +521,7 @@
@property (nonatomic, readonly) NSAttributedString *smallIcon;
@property (nonatomic, readonly) NSAttributedString *linkedIcon;
@property (nonatomic, readonly) NSAttributedString *linkedSmallIcon;
-@property (nonatomic, nullable, readonly) NSArray *SkimNotes;
+@property (nonatomic, nullable, readonly) NSArray<NSDictionary<NSString *, id>
*> *SkimNotes;
@property (nonatomic, nullable, readonly) NSString *textSkimNotes;
@property (nonatomic, nullable, readonly) NSAttributedString
*richTextSkimNotes;
Modified: trunk/bibdesk/NSTextView_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSTextView_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSTextView_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -45,7 +45,7 @@
- (void)highlightComponentsOfSearchString:(NSString *)searchString;
- (void)highlightOccurrencesOfString:(NSString *)substring;
-- (void)setSafeSelectedRanges:(NSArray *)ranges;
+- (void)setSafeSelectedRanges:(NSArray<NSValue *> *)ranges;
@end
Modified: trunk/bibdesk/NSURL_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSURL_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSURL_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -56,13 +56,13 @@
- (BOOL)hasDomain:(NSString *)domain;
- (BOOL)hasFirstPathComponent:(NSString *)pathComponent;
-@property (nonatomic, nullable, readonly) NSArray *SkimNotes;
+@property (nonatomic, nullable, readonly) NSArray<NSDictionary<NSString *, id>
*> *SkimNotes;
@property (nonatomic, nullable, readonly) NSString *textSkimNotes;
@property (nonatomic, nullable, readonly) NSAttributedString
*richTextSkimNotes;
-@property (nonatomic, nullable, readonly) NSArray *scriptingSkimNotes;
+@property (nonatomic, nullable, readonly) NSArray<NSDictionary<NSString *, id>
*> *scriptingSkimNotes;
@property (nonatomic) NSInteger finderLabel;
-@property (nonatomic, nullable, readonly) NSArray *openMetaTags;
+@property (nonatomic, nullable, readonly) NSArray<NSString *> *openMetaTags;
@property (nonatomic, readonly) double openMetaRating;
@property (nonatomic, readonly) NSData *md5Hash;
Modified: trunk/bibdesk/NSWorkspace_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSWorkspace_BDSKExtensions.h 2025-11-21 17:45:19 UTC (rev
29868)
+++ trunk/bibdesk/NSWorkspace_BDSKExtensions.h 2025-11-21 22:50:30 UTC (rev
29869)
@@ -42,7 +42,7 @@
@interface NSWorkspace (BDSKExtensions)
-- (BOOL)openURLs:(NSArray *)fileURLs withSearchString:(nullable NSString
*)searchString;
+- (BOOL)openURLs:(NSArray<NSURL *> *)fileURLs withSearchString:(nullable
NSString *)searchString;
- (BOOL)openURLWithDefaultApp:(NSURL *)aURL;
- (BOOL)openURL:(NSURL *)aURL withApplicationURL:(NSURL *)applicationURL
andSearchString:(nullable NSString *)searchString;
@@ -55,7 +55,7 @@
- (BOOL)isAutomatorWorkflowAtPath:(NSString *)path;
- (BOOL)isFolderAtPath:(NSString *)path;
-- (void)emailTo:(nullable NSString *)receiver subject:(nullable NSString
*)subject body:(nullable NSString *)body attachments:(nullable NSArray *)files;
+- (void)emailTo:(nullable NSString *)receiver subject:(nullable NSString
*)subject body:(nullable NSString *)body attachments:(nullable NSArray<NSString
*> *)files;
@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
