Revision: 29842
http://sourceforge.net/p/bibdesk/svn/29842
Author: hofman
Date: 2025-11-18 17:12:24 +0000 (Tue, 18 Nov 2025)
Log Message:
-----------
Use specific types for array KV methods
Modified Paths:
--------------
trunk/bibdesk/BDSKErrorObjectController.h
trunk/bibdesk/BDSKErrorObjectController.m
trunk/bibdesk/BDSKFileMatchConfigController.h
trunk/bibdesk/BDSKFileMatchConfigController.m
trunk/bibdesk/BDSKFindController.h
trunk/bibdesk/BDSKFindController.m
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.h
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTreeNode.h
trunk/bibdesk/BDSKTreeNode.m
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2025-11-18 17:12:24 UTC (rev
29842)
@@ -67,14 +67,14 @@
- (NSArray *)errors;
- (NSUInteger)countOfErrors;
-- (id)objectInErrorsAtIndex:(NSUInteger)index;
-- (void)insertObject:(id)obj inErrorsAtIndex:(NSUInteger)index;
+- (BDSKErrorObject *)objectInErrorsAtIndex:(NSUInteger)index;
+- (void)insertObject:(BDSKErrorObject *)obj inErrorsAtIndex:(NSUInteger)index;
- (void)removeObjectFromErrorsAtIndex:(NSUInteger)index;
- (NSArray *)managers;
- (NSUInteger)countOfManagers;
-- (id)objectInManagersAtIndex:(NSUInteger)theIndex;
-- (void)insertObject:(id)obj inManagersAtIndex:(NSUInteger)theIndex;
+- (BDSKErrorManager *)objectInManagersAtIndex:(NSUInteger)theIndex;
+- (void)insertObject:(BDSKErrorManager *)obj
inManagersAtIndex:(NSUInteger)theIndex;
- (void)removeObjectFromManagersAtIndex:(NSUInteger)theIndex;
- (void)addManager:(BDSKErrorManager *)manager;
- (void)removeManager:(BDSKErrorManager *)manager;
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2025-11-18 17:12:24 UTC (rev
29842)
@@ -153,11 +153,11 @@
return [errors count];
}
-- (id)objectInErrorsAtIndex:(NSUInteger)idx {
+- (BDSKErrorObject *)objectInErrorsAtIndex:(NSUInteger)idx {
return [errors objectAtIndex:idx];
}
-- (void)insertObject:(id)obj inErrorsAtIndex:(NSUInteger)idx {
+- (void)insertObject:(BDSKErrorObject *)obj inErrorsAtIndex:(NSUInteger)idx {
[errors insertObject:obj atIndex:idx];
}
@@ -175,11 +175,11 @@
return [managers count];
}
-- (id)objectInManagersAtIndex:(NSUInteger)theIndex {
+- (BDSKErrorManager *)objectInManagersAtIndex:(NSUInteger)theIndex {
return [managers objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inManagersAtIndex:(NSUInteger)theIndex {
+- (void)insertObject:(BDSKErrorManager *)obj
inManagersAtIndex:(NSUInteger)theIndex {
[managers insertObject:obj atIndex:theIndex];
}
Modified: trunk/bibdesk/BDSKFileMatchConfigController.h
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.h 2025-11-18 16:50:22 UTC
(rev 29841)
+++ trunk/bibdesk/BDSKFileMatchConfigController.h 2025-11-18 17:12:24 UTC
(rev 29842)
@@ -73,8 +73,8 @@
- (NSArray *)files;
- (NSUInteger)countOfFiles;
-- (id)objectInFilesAtIndex:(NSUInteger)anIndex;
-- (void)insertObject:(id)obj inFilesAtIndex:(NSUInteger)anIndex;
+- (NSURL *)objectInFilesAtIndex:(NSUInteger)anIndex;
+- (void)insertObject:(NSURL *)obj inFilesAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromFilesAtIndex:(NSUInteger)anIndex;
@end
Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m 2025-11-18 16:50:22 UTC
(rev 29841)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m 2025-11-18 17:12:24 UTC
(rev 29842)
@@ -164,11 +164,11 @@
return [files count];
}
-- (id)objectInFilesAtIndex:(NSUInteger)anIndex {
+- (NSURL *)objectInFilesAtIndex:(NSUInteger)anIndex {
return [files objectAtIndex:anIndex];
}
-- (void)insertObject:(id)obj inFilesAtIndex:(NSUInteger)anIndex {
+- (void)insertObject:(NSURL *)obj inFilesAtIndex:(NSUInteger)anIndex {
[files insertObject:obj atIndex:anIndex];
}
Modified: trunk/bibdesk/BDSKFindController.h
===================================================================
--- trunk/bibdesk/BDSKFindController.h 2025-11-18 16:50:22 UTC (rev 29841)
+++ trunk/bibdesk/BDSKFindController.h 2025-11-18 17:12:24 UTC (rev 29842)
@@ -192,14 +192,14 @@
- (NSArray *)findHistory;
- (NSUInteger)countOfFindHistory;
-- (id)objectInFindHistoryAtIndex:(NSUInteger)index;
-- (void)insertObject:(id)obj inFindHistoryAtIndex:(NSUInteger)index;
+- (NSString *)objectInFindHistoryAtIndex:(NSUInteger)index;
+- (void)insertObject:(NSString *)obj inFindHistoryAtIndex:(NSUInteger)index;
- (void)removeObjectFromFindHistoryAtIndex:(NSUInteger)index;
- (NSArray *)replaceHistory;
- (NSUInteger)countOfReplaceHistory;
-- (id)objectInReplaceHistoryAtIndex:(NSUInteger)index;
-- (void)insertObject:(id)obj inReplaceHistoryAtIndex:(NSUInteger)index;
+- (NSString *)objectInReplaceHistoryAtIndex:(NSUInteger)index;
+- (void)insertObject:(NSString *)obj inReplaceHistoryAtIndex:(NSUInteger)index;
- (void)removeObjectFromReplaceHistoryAtIndex:(NSUInteger)index;
- (IBAction)toggleStatusBar:(nullable id)sender;
Modified: trunk/bibdesk/BDSKFindController.m
===================================================================
--- trunk/bibdesk/BDSKFindController.m 2025-11-18 16:50:22 UTC (rev 29841)
+++ trunk/bibdesk/BDSKFindController.m 2025-11-18 17:12:24 UTC (rev 29842)
@@ -300,11 +300,11 @@
return [findHistory count];
}
-- (id)objectInFindHistoryAtIndex:(NSUInteger)idx {
+- (NSString *)objectInFindHistoryAtIndex:(NSUInteger)idx {
return [findHistory objectAtIndex:idx];
}
-- (void)insertObject:(id)obj inFindHistoryAtIndex:(NSUInteger)idx {
+- (void)insertObject:(NSString *)obj inFindHistoryAtIndex:(NSUInteger)idx {
if ([NSString isEmptyString:obj] || [findHistory containsObject:obj])
return;
[findHistory insertObject:obj atIndex:idx];
@@ -325,11 +325,11 @@
return [replaceHistory count];
}
-- (id)objectInReplaceHistoryAtIndex:(NSUInteger)idx {
+- (NSString *)objectInReplaceHistoryAtIndex:(NSUInteger)idx {
return [replaceHistory objectAtIndex:idx];
}
-- (void)insertObject:(id)obj inReplaceHistoryAtIndex:(NSUInteger)idx {
+- (void)insertObject:(NSString *)obj inReplaceHistoryAtIndex:(NSUInteger)idx {
if ([NSString isEmptyString:obj] || [replaceHistory containsObject:obj])
return;
[replaceHistory insertObject:obj atIndex:idx];
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2025-11-18 17:12:24 UTC (rev
29842)
@@ -40,7 +40,7 @@
NS_ASSUME_NONNULL_BEGIN
-@class BDSKMacroResolver, BDSKTableView, BDSKComplexStringFormatter;
+@class BDSKMacroResolver, BDSKTableView, BDSKComplexStringFormatter, BDSKMacro;
@interface BDSKMacroWindowController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
NSArrayController *arrayController;
@@ -68,10 +68,10 @@
- (NSArray *)macros;
- (void)setMacros:(NSArray *)newMacros;
- (NSUInteger)countOfMacros;
-- (id)objectInMacrosAtIndex:(NSUInteger)idx;
-- (void)insertObject:(id)obj inMacrosAtIndex:(NSUInteger)idx;
+- (BDSKMacro *)objectInMacrosAtIndex:(NSUInteger)idx;
+- (void)insertObject:(BDSKMacro *)obj inMacrosAtIndex:(NSUInteger)idx;
- (void)removeObjectFromMacrosAtIndex:(NSUInteger)idx;
-- (void)replaceObjectInMacrosAtIndex:(NSUInteger)idx withObject:(id)obj;
+- (void)replaceObjectInMacrosAtIndex:(NSUInteger)idx withObject:(BDSKMacro
*)obj;
- (IBAction)addRemoveMacro:(nullable id)sender;
- (BOOL)addMacrosFromBibTeXString:(NSString *)aString;
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2025-11-18 17:12:24 UTC (rev
29842)
@@ -210,11 +210,11 @@
return [macros count];
}
-- (id)objectInMacrosAtIndex:(NSUInteger)idx {
+- (BDSKMacro *)objectInMacrosAtIndex:(NSUInteger)idx {
return [macros objectAtIndex:idx];
}
-- (void)insertObject:(id)obj inMacrosAtIndex:(NSUInteger)idx {
+- (void)insertObject:(BDSKMacro *)obj inMacrosAtIndex:(NSUInteger)idx {
[macros insertObject:obj atIndex:idx];
}
@@ -222,7 +222,7 @@
[macros removeObjectAtIndex:idx];
}
-- (void)replaceObjectInMacrosAtIndex:(NSUInteger)idx withObject:(id)obj {
+- (void)replaceObjectInMacrosAtIndex:(NSUInteger)idx withObject:(BDSKMacro
*)obj {
[macros replaceObjectAtIndex:idx withObject:obj];
}
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.h
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.h 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.h 2025-11-18 17:12:24 UTC (rev
29842)
@@ -88,8 +88,8 @@
- (NSArray *)orphanedFiles;
- (NSUInteger)countOfOrphanedFiles;
-- (id)objectInOrphanedFilesAtIndex:(NSUInteger)theIndex;
-- (void)insertObject:(id)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex;
+- (NSURL *)objectInOrphanedFilesAtIndex:(NSUInteger)theIndex;
+- (void)insertObject:(NSURL *)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex;
- (void)removeObjectFromOrphanedFilesAtIndex:(NSUInteger)theIndex;
@property (nonatomic, nullable, strong) NSString *searchString;
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2025-11-18 17:12:24 UTC (rev
29842)
@@ -264,11 +264,11 @@
return [orphanedFiles count];
}
-- (id)objectInOrphanedFilesAtIndex:(NSUInteger)theIndex {
+- (NSURL *)objectInOrphanedFilesAtIndex:(NSUInteger)theIndex {
return [orphanedFiles objectAtIndex:theIndex];
}
-- (void)insertObject:(id)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex {
+- (void)insertObject:(NSURL *)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex {
[orphanedFiles insertObject:obj atIndex:theIndex];
}
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2025-11-18 16:50:22 UTC (rev
29841)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2025-11-18 17:12:24 UTC (rev
29842)
@@ -450,7 +450,7 @@
return sizeof(BDSKDefaultFontSizes) / sizeof(CGFloat);
}
-- (id)objectInSizesAtIndex:(NSUInteger)idx {
+- (NSNumber *)objectInSizesAtIndex:(NSUInteger)idx {
return [NSNumber numberWithDouble:BDSKDefaultFontSizes[idx]];
}
@@ -458,7 +458,7 @@
return 1 + sizeof(BDSKDefaultFontSizes) / sizeof(CGFloat);
}
-- (id)objectInTokenSizesAtIndex:(NSUInteger)idx {
+- (NSNumber *)objectInTokenSizesAtIndex:(NSUInteger)idx {
return [NSNumber numberWithDouble:idx == 0 ? 0.0 :
BDSKDefaultFontSizes[idx - 1]];
}
Modified: trunk/bibdesk/BDSKTreeNode.h
===================================================================
--- trunk/bibdesk/BDSKTreeNode.h 2025-11-18 16:50:22 UTC (rev 29841)
+++ trunk/bibdesk/BDSKTreeNode.h 2025-11-18 17:12:24 UTC (rev 29842)
@@ -55,8 +55,8 @@
- (nullable NSArray *)children;
- (void)setChildren:(nullable NSArray *)newChildren;
- (NSUInteger)countOfChildren;
-- (id)objectInChildrenAtIndex:(NSUInteger)anIndex;
-- (void)insertObject:(id)obj inChildrenAtIndex:(NSUInteger)anIndex;
+- (__kindof BDSKTreeNode *)objectInChildrenAtIndex:(NSUInteger)anIndex;
+- (void)insertObject:(__kindof BDSKTreeNode *)obj
inChildrenAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromChildrenAtIndex:(NSUInteger)anIndex;
@property (nonatomic, nullable, weak) BDSKTreeNode *parent;
Modified: trunk/bibdesk/BDSKTreeNode.m
===================================================================
--- trunk/bibdesk/BDSKTreeNode.m 2025-11-18 16:50:22 UTC (rev 29841)
+++ trunk/bibdesk/BDSKTreeNode.m 2025-11-18 17:12:24 UTC (rev 29842)
@@ -136,11 +136,11 @@
return [children count];
}
-- (id)objectInChildrenAtIndex:(NSUInteger)anIndex {
+- (__kindof BDSKTreeNode *)objectInChildrenAtIndex:(NSUInteger)anIndex {
return [children objectAtIndex:anIndex];
}
-- (void)insertObject:(id)obj inChildrenAtIndex:(NSUInteger)anIndex {
+- (void)insertObject:(__kindof BDSKTreeNode *)obj
inChildrenAtIndex:(NSUInteger)anIndex {
[children insertObject:obj atIndex:anIndex];
// make sure this child knows its parent
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
