Revision: 29009
          http://sourceforge.net/p/bibdesk/svn/29009
Author:   hofman
Date:     2025-02-17 09:40:56 +0000 (Mon, 17 Feb 2025)
Log Message:
-----------
Some group properties are not nullable

Modified Paths:
--------------
    trunk/bibdesk/BDSKExternalGroup.h
    trunk/bibdesk/BDSKGroup.h
    trunk/bibdesk/BDSKScriptGroup.h
    trunk/bibdesk/BDSKSharedGroup.m
    trunk/bibdesk/BDSKSmartGroup.h
    trunk/bibdesk/BDSKSmartGroup.m
    trunk/bibdesk/BDSKStaticGroup.h
    trunk/bibdesk/BDSKStaticGroup.m
    trunk/bibdesk/BDSKURLGroup.h
    trunk/bibdesk/BDSKURLGroup.m

Modified: trunk/bibdesk/BDSKExternalGroup.h
===================================================================
--- trunk/bibdesk/BDSKExternalGroup.h   2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKExternalGroup.h   2025-02-17 09:40:56 UTC (rev 29009)
@@ -51,7 +51,7 @@
     BDSKMacroResolver *macroResolver;
 }
 
-- (instancetype)initWithName:(nullable NSString *)aName;
+- (instancetype)initWithName:(NSString *)aName;
 
 - (void)refresh;
 

Modified: trunk/bibdesk/BDSKGroup.h
===================================================================
--- trunk/bibdesk/BDSKGroup.h   2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKGroup.h   2025-02-17 09:40:56 UTC (rev 29009)
@@ -81,7 +81,7 @@
        @discussion This is the designated initializer. 
        @param aName The name for the group.
 */
-- (instancetype)initWithName:(nullable id)aName;
+- (instancetype)initWithName:(id)aName;
 
 - (instancetype)initWithDictionary:(NSDictionary *)groupDict;
 
@@ -89,7 +89,7 @@
 
 @property (nonatomic, readonly) NSString *uniqueID;
 
-@property (nonatomic, nullable, readonly) id name;
+@property (nonatomic, readonly) id name;
 @property (nonatomic, nullable, readonly) NSString *label;
 @property (nonatomic) NSInteger count;
 @property (nonatomic, nullable, readonly) NSImage *icon;
@@ -103,7 +103,7 @@
 @property (nonatomic, readonly, getter=isRetrieving) BOOL retrieving;
 @property (nonatomic, readonly) BOOL displayAsColor;
 
-@property (nonatomic, nullable, readonly) NSString *displayName;
+@property (nonatomic, readonly) NSString *displayName;
 
 @property (nonatomic, nullable, readonly) NSString *errorMessage;
 
@@ -122,7 +122,7 @@
 
 @protocol BDSKMutableGroup <NSObject>
 
-@property (nonatomic, nullable, strong) id name;
+@property (nonatomic, strong) id name;
 @property (nonatomic, nullable, readonly) NSUndoManager *undoManager;
 
 @end

Modified: trunk/bibdesk/BDSKScriptGroup.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroup.h     2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKScriptGroup.h     2025-02-17 09:40:56 UTC (rev 29009)
@@ -60,10 +60,10 @@
     NSData *stdoutData;
 }
 
-- (instancetype)initWithScriptPath:(nullable NSString *)path 
scriptArguments:(nullable NSString *)arguments;
+- (instancetype)initWithScriptPath:(NSString *)path scriptArguments:(nullable 
NSString *)arguments;
 - (instancetype)initWithName:(nullable NSString *)aName scriptPath:(nullable 
NSString *)path scriptArguments:(nullable NSString *)arguments 
scriptType:(BDSKScriptType)type;
 
-@property (nonatomic, nullable, strong) NSString *scriptPath;
+@property (nonatomic, strong) NSString *scriptPath;
 @property (nonatomic, nullable, strong) NSString *scriptArguments;
 @property (nonatomic) BDSKScriptType scriptType;
 

Modified: trunk/bibdesk/BDSKSharedGroup.m
===================================================================
--- trunk/bibdesk/BDSKSharedGroup.m     2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKSharedGroup.m     2025-02-17 09:40:56 UTC (rev 29009)
@@ -98,7 +98,7 @@
 #pragma mark Init and dealloc
 
 // old designated initializer
-- (instancetype)initWithName:(NSString *)aName;
+- (instancetype)initWithName:(id)aName;
 {
     self = nil;
     return self;

Modified: trunk/bibdesk/BDSKSmartGroup.h
===================================================================
--- trunk/bibdesk/BDSKSmartGroup.h      2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKSmartGroup.h      2025-02-17 09:40:56 UTC (rev 29009)
@@ -52,10 +52,10 @@
        BDSKFilter *filter;
 }
 
-- (instancetype)initWithFilter:(nullable BDSKFilter *)aFilter;
-- (instancetype)initWithName:(nullable id)aName filter:(nullable BDSKFilter 
*)aFilter;
+- (instancetype)initWithFilter:(BDSKFilter *)aFilter;
+- (instancetype)initWithName:(NSString *)aName filter:(BDSKFilter *)aFilter;
 
-@property (nonatomic, nullable, strong) BDSKFilter *filter;
+@property (nonatomic, strong) BDSKFilter *filter;
 
 - (void)invalidateCount;
 

Modified: trunk/bibdesk/BDSKSmartGroup.m
===================================================================
--- trunk/bibdesk/BDSKSmartGroup.m      2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKSmartGroup.m      2025-02-17 09:40:56 UTC (rev 29009)
@@ -58,7 +58,7 @@
 }
 
 // designated initializer
-- (instancetype)initWithName:(id)aName filter:(BDSKFilter *)aFilter {
+- (instancetype)initWithName:(NSString *)aName filter:(BDSKFilter *)aFilter {
     self = [super initWithName:aName];
     if (self) {
         filter = [aFilter copy];

Modified: trunk/bibdesk/BDSKStaticGroup.h
===================================================================
--- trunk/bibdesk/BDSKStaticGroup.h     2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKStaticGroup.h     2025-02-17 09:40:56 UTC (rev 29009)
@@ -48,9 +48,9 @@
     NSArray *tmpKeys;
 }
 
-- (instancetype)initWithName:(nullable id)aName publications:(nullable NSArray 
*)array;
+- (instancetype)initWithName:(NSString *)aName publications:(nullable NSArray 
*)array;
 
-@property (nonatomic, nullable, copy) NSArray *publications;
+@property (nonatomic, copy) NSArray *publications;
 
 - (void)addPublication:(BibItem *)item;
 - (void)addPublicationsFromArray:(NSArray *)items;

Modified: trunk/bibdesk/BDSKStaticGroup.m
===================================================================
--- trunk/bibdesk/BDSKStaticGroup.m     2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKStaticGroup.m     2025-02-17 09:40:56 UTC (rev 29009)
@@ -51,7 +51,7 @@
 @synthesize publications;
 
 // designated initializer
-- (instancetype)initWithName:(id)aName publications:(NSArray *)array {
+- (instancetype)initWithName:(NSString *)aName publications:(NSArray *)array {
     self = [super initWithName:aName];
     if (self) {
         publications = [[NSMutableArray alloc] initWithArray:array];

Modified: trunk/bibdesk/BDSKURLGroup.h
===================================================================
--- trunk/bibdesk/BDSKURLGroup.h        2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKURLGroup.h        2025-02-17 09:40:56 UTC (rev 29009)
@@ -51,10 +51,10 @@
     BDSKDownload *download;
 }
 
-- (instancetype)initWithName:(nullable NSString *)aName URL:(nullable NSURL 
*)aURL;
-- (instancetype)initWithURL:(nullable NSURL *)aURL;
+- (instancetype)initWithName:(nullable NSString *)aName URL:(NSURL *)aURL;
+- (instancetype)initWithURL:(NSURL *)aURL;
 
-@property (nonatomic, nullable, strong) NSURL *URL;
+@property (nonatomic, strong) NSURL *URL;
 
 @end
 

Modified: trunk/bibdesk/BDSKURLGroup.m
===================================================================
--- trunk/bibdesk/BDSKURLGroup.m        2025-02-16 22:48:28 UTC (rev 29008)
+++ trunk/bibdesk/BDSKURLGroup.m        2025-02-17 09:40:56 UTC (rev 29009)
@@ -58,7 +58,7 @@
 @synthesize URL;
 
 // old designated initializer
-- (instancetype)initWithName:(NSString *)aName;
+- (instancetype)initWithName:(id)aName;
 {
     self = nil;
     return self;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to