Revision: 29651
http://sourceforge.net/p/bibdesk/svn/29651
Author: hofman
Date: 2025-10-02 09:15:47 +0000 (Thu, 02 Oct 2025)
Log Message:
-----------
declare designated initializer for controllers, make sure it calls through
super's designated initializer
Modified Paths:
--------------
trunk/bibdesk/BDSKComplexStringEditor.h
trunk/bibdesk/BDSKComplexStringEditor.m
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKCustomCiteDrawerController.h
trunk/bibdesk/BDSKCustomCiteDrawerController.m
trunk/bibdesk/BDSKEditor.h
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKErrorObjectController.m
trunk/bibdesk/BDSKFieldSheetController.h
trunk/bibdesk/BDSKFieldSheetController.m
trunk/bibdesk/BDSKFileContentSearchController.h
trunk/bibdesk/BDSKFileMatchConfigController.m
trunk/bibdesk/BDSKFileMatcher.m
trunk/bibdesk/BDSKFileMigrationController.h
trunk/bibdesk/BDSKFileMigrationController.m
trunk/bibdesk/BDSKFilerErrorController.h
trunk/bibdesk/BDSKFilerErrorController.m
trunk/bibdesk/BDSKFilterController.h
trunk/bibdesk/BDSKFilterController.m
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKMergeController.h
trunk/bibdesk/BDSKMergeController.m
trunk/bibdesk/BDSKNotesWindowController.h
trunk/bibdesk/BDSKNotesWindowController.m
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BDSKPreferencePane.h
trunk/bibdesk/BDSKPreviewer.m
trunk/bibdesk/BDSKScriptGroupSheetController.h
trunk/bibdesk/BDSKScriptGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupViewController.m
trunk/bibdesk/BDSKTextImportController.h
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTextViewCompletionController.h
trunk/bibdesk/BDSKTouchBarButtonGroup.h
trunk/bibdesk/BDSKTouchBarButtonGroup.m
trunk/bibdesk/BDSKTypeInfoEditor.m
trunk/bibdesk/BDSKURLGroupSheetController.h
trunk/bibdesk/BDSKURLGroupSheetController.m
trunk/bibdesk/BDSKWebGroupViewController.m
Modified: trunk/bibdesk/BDSKComplexStringEditor.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKComplexStringEditor.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -51,8 +51,11 @@
NSText *editor;
}
-- (instancetype)initWithFormatter:(BDSKComplexStringFormatter *)aFormatter;
+- (instancetype)initWithFormatter:(BDSKComplexStringFormatter *)aFormatter
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
- (void)attachToEditor:(NSText *)textObj;
- (void)remove;
Modified: trunk/bibdesk/BDSKComplexStringEditor.m
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKComplexStringEditor.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -65,7 +65,7 @@
@dynamic attached;
- (instancetype)initWithFormatter:(BDSKComplexStringFormatter *)aFormatter {
- self = [self initWithWindowNibName:@"ComplexStringEditor"];
+ self = [super initWithWindow:nil];
if (self) {
// don't retain as it owns us
formatter = aFormatter;
@@ -73,6 +73,10 @@
return self;
}
+- (NSString *)windowNibName {
+ return @"ComplexStringEditor";
+}
+
- (void)attachToEditor:(NSText *)textObj {
if ([self isAttached]) {
if (editor == textObj) {
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKConditionController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -100,8 +100,11 @@
@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*valueWidthConstraint;
@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*stringvalueWidthConstraint;
-- (instancetype)initWithCondition:(nullable BDSKCondition *)aCondition;
+- (instancetype)initWithCondition:(nullable BDSKCondition *)aCondition
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibName bundle:(nullable
NSBundle *)bundle NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
- (IBAction)changeRating:(nullable id)sender;
@property (nonatomic, nullable, weak) BDSKFilterController *filterController;
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.h
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.h 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.h 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -47,8 +47,11 @@
NSMutableArray *customStringArray;
}
-- (instancetype)initForDocument:(BibDocument *)aDocument;
+- (instancetype)initForDocument:(BibDocument *)aDocument
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibName bundle:(nullable
NSBundle *)bundle NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
@property (nonatomic, readonly) CGFloat contentWidth;
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.m
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.m 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.m 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -51,7 +51,7 @@
@dynamic contentWidth;
- (instancetype)initForDocument:(BibDocument *)aDocument{
- if(self = [super init]){
+ if(self = [super initWithNibName:@"BDSKCustomCiteDrawer" bundle:nil]){
customStringArray = [NSMutableArray arrayWithCapacity:6];
[customStringArray setArray:[[NSUserDefaults
standardUserDefaults] arrayForKey:BDSKCustomCiteStringsKey]];
document = aDocument;
@@ -59,10 +59,6 @@
return self;
}
-- (NSString *)nibName{
- return @"BDSKCustomCiteDrawer";
-}
-
- (void)viewDidLoad {
[super viewDidLoad];
Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKEditor.h 2025-10-02 09:15:47 UTC (rev 29651)
@@ -120,8 +120,11 @@
} editorFlags;
}
-- (instancetype)initWithPublication:(BibItem *)aBib;
+- (instancetype)initWithPublication:(BibItem *)aBib NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSSplitView *mainSplitView;
@property (nonatomic, nullable, strong) IBOutlet NSSplitView *fileSplitView;
@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *bibTypeButton;
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKEditor.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -160,7 +160,7 @@
}
- (instancetype)initWithPublication:(BibItem *)aBib{
- self = [super initWithWindowNibName:@"BDSKEditor"];
+ self = [super initWithWindow:nil];
if (self) {
publication = aBib;
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKErrorEditor.h 2025-10-02 09:15:47 UTC (rev 29651)
@@ -60,12 +60,15 @@
}
// designated initializer
-- (instancetype)initWithFileURL:(nullable NSURL *)aFileURL
pasteDragData:(nullable NSData *)aData;
+- (instancetype)initWithFileURL:(nullable NSURL *)aFileURL
pasteDragData:(nullable NSData *)aData NS_DESIGNATED_INITIALIZER;
// for editing document source file, load and name errors
- (instancetype)initWithFileURL:(NSURL *)aFileURL;
// for editing Paste/Drag data
- (instancetype)initWithPasteDragData:(NSData *)aData;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTextView *textView;
@property (nonatomic, nullable, strong) IBOutlet NSButton
*syntaxHighlightCheckbox;
@property (nonatomic, nullable, strong) IBOutlet NSButton *reopenButton;
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKErrorEditor.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -85,7 +85,7 @@
}
- (instancetype)initWithFileURL:(NSURL *)aFileURL pasteDragData:(NSData
*)aData {
- if(self = [super init]){
+ if(self = [super initWithWindow:nil]){
manager = nil;
errors = nil;
fileURL = aFileURL;
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -82,7 +82,7 @@
- (instancetype)init;
{
BDSKPRECONDITION(sharedErrorObjectController == nil);
- self = [super initWithWindowNibName:@"BDSKErrorPanel"];
+ self = [super initWithWindow:nil];
if (self) {
errors = [[NSMutableArray alloc] init];
managers = [[NSMutableArray alloc] initWithObjects:[BDSKErrorManager
allItemsErrorManager], nil];
@@ -104,6 +104,10 @@
return self;
}
+- (NSString *)windowNibName {
+ return @"BDSKErrorPanel";
+}
+
- (void)windowDidLoad;
{
[self setWindowFrameAutosaveName:BDSKErrorPanelFrameAutosaveName];
Modified: trunk/bibdesk/BDSKFieldSheetController.h
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFieldSheetController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -63,6 +63,10 @@
+ (instancetype)fieldSheetControllerWithSelectableFields:(NSArray
*)selectableFields label:(NSString *)selectedFieldLabel;
+ (instancetype)fieldSheetControllerWithChoosableFields:(NSArray
*)choosableFields label:(NSString *)chosenFieldLabel;
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton
*selectedFieldPopUpButton;
@property (nonatomic, nullable, strong) IBOutlet NSComboBox
*chosenFieldComboBox;
Modified: trunk/bibdesk/BDSKFieldSheetController.m
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFieldSheetController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -72,7 +72,7 @@
}
- (instancetype)init {
- self = [super initWithWindowNibName:@"FieldSheet"];
+ self = [super initWithWindow:nil];
if (self) {
[self setCancelButtonTitle:NSLocalizedString(@"Cancel", @"Button
title")];
[self setDefaultButtonTitle:NSLocalizedString(@"OK", @"Button title")];
@@ -80,6 +80,10 @@
return self;
}
+- (NSString *)windowNibName {
+ return @"FieldSheet";
+}
+
- (void)windowDidLoad {
[[chosenFieldComboBox formatter] setKnownFieldNames:choosableFields];
}
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKFileContentSearchController.h 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -79,8 +79,11 @@
}
// Use this method to instantiate a search controller for use within a
document window
-- (instancetype)initForOwner:(nullable id<BDSKOwner>)owner;
+- (instancetype)initForOwner:(nullable id<BDSKOwner>)owner
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet
BDSKSelectionPreservingArrayController *resultsArrayController;
@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *tableView;
@property (nonatomic, nullable, strong) IBOutlet BDSKEdgeView *controlView;
Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -61,7 +61,7 @@
- (instancetype)init
{
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
documents = [NSArray new];
files = [NSMutableArray new];
Modified: trunk/bibdesk/BDSKFileMatcher.m
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKFileMatcher.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -104,7 +104,7 @@
- (instancetype)init
{
BDSKPRECONDITION(sharedInstance == nil);
- self = [super initWithWindowNibName:[self windowNibName]];
+ self = [super initWithWindow:nil];
if (self) {
matches = [[NSMutableArray alloc] init];
_matchFlags.shouldAbort = NO;
Modified: trunk/bibdesk/BDSKFileMigrationController.h
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFileMigrationController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -51,6 +51,10 @@
NSMutableArray *results;
}
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
@property (nonatomic, nullable, strong) IBOutlet NSButton *migrateButton;
@property (nonatomic, nullable, strong) IBOutlet NSProgressIndicator
*progressBar;
Modified: trunk/bibdesk/BDSKFileMigrationController.m
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFileMigrationController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -79,7 +79,7 @@
- (instancetype)init
{
- self = [self initWithWindowNibName:[self windowNibName]];
+ self = [super initWithWindow:nil];
if (self) {
NSUserDefaults*sud = [NSUserDefaults standardUserDefaults];
results = [NSMutableArray new];
Modified: trunk/bibdesk/BDSKFilerErrorController.h
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFilerErrorController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -57,8 +57,11 @@
NSArray *errorInfoDicts;
}
-- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(nullable NSString *)actionName;
+- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks actionName:(nullable NSString *)actionName
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTableView *tv;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *infoTextField;
@property (nonatomic, nullable, strong) IBOutlet NSImageView *iconView;
Modified: trunk/bibdesk/BDSKFilerErrorController.m
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFilerErrorController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -72,7 +72,7 @@
}
- (instancetype)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)mask actionName:(NSString *)action {
- self = [super initWithWindowNibName:@"AutoFile"];
+ self = [super initWithWindow:nil];
if (self) {
fieldName = field;
options = mask;
@@ -91,6 +91,10 @@
[tv setDataSource:nil];
}
+- (NSString *)windowNibName {
+ return @"AutoFile";
+}
+
- (void)windowDidLoad {
[self setWindowFrameAutosaveNameOrCascade:@"AutoFileWindow"];
Modified: trunk/bibdesk/BDSKFilterController.h
===================================================================
--- trunk/bibdesk/BDSKFilterController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFilterController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -54,8 +54,11 @@
NSUndoManager *undoManager;
}
-- (instancetype)initWithFilter:(BDSKFilter *)aFilter;
+- (instancetype)initWithFilter:(BDSKFilter *)aFilter NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSView *conditionsView;
@property (nonatomic, nullable, strong) IBOutlet NSLayoutConstraint
*widthConstraint;
@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
Modified: trunk/bibdesk/BDSKFilterController.m
===================================================================
--- trunk/bibdesk/BDSKFilterController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKFilterController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -74,7 +74,7 @@
- (instancetype)initWithFilter:(BDSKFilter *)filter
{
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
conditionControllers = [[NSMutableArray alloc]
initWithCapacity:[[filter conditions] count]];
conjunction = [filter conjunction];
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -54,8 +54,11 @@
BOOL showAll;
}
-- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
+- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSArrayController
*arrayController;
@property (nonatomic, nullable, strong) IBOutlet BDSKTableView *tableView;
@property (nonatomic, nullable, strong) IBOutlet NSButton *closeButton;
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -68,13 +68,8 @@
@synthesize arrayController, tableView, closeButton, addRemoveButton,
macroResolver;
-- (instancetype)init {
- self = nil;
- return self;
-}
-
- (instancetype)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver {
- self = [super initWithWindowNibName:@"MacroWindow"];
+ self = [super initWithWindow:nil];
if (self) {
macroResolver = aMacroResolver;
@@ -116,6 +111,10 @@
[tableView setDataSource:nil];
}
+- (NSString *)windowNibName {
+ return @"MacroWindow";
+}
+
- (void)updateButtons{
[addRemoveButton setEnabled:isEditable forSegment:0];
[addRemoveButton setEnabled:isEditable && [tableView numberOfSelectedRows]
forSegment:1];
Modified: trunk/bibdesk/BDSKMergeController.h
===================================================================
--- trunk/bibdesk/BDSKMergeController.h 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKMergeController.h 2025-10-02 09:15:47 UTC (rev 29651)
@@ -59,8 +59,11 @@
+ (void)mergePublication:(BibItem *)mergedPub withPublication:(BibItem *)pub
fromDocument:(BibDocument *)doc window:(NSWindow *)window
completionHandler:(void (^ _Nullable )(BOOL didMerge, BDSKAutoGenerateStatus
status))handler;
-- (instancetype)initWithPublication:(BibItem *)aPub mergedPublication:(BibItem
*)mergedPub fromDocument:(BibDocument *)aDoc completionHandler:(void (^
_Nullable)(BOOL didMerge, BDSKAutoGenerateStatus status))handler;
+- (instancetype)initWithPublication:(BibItem *)aPub mergedPublication:(BibItem
*)mergedPub fromDocument:(BibDocument *)aDoc completionHandler:(void (^
_Nullable)(BOOL didMerge, BDSKAutoGenerateStatus status))handler
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTableView *tableView;
@property (nonatomic, nullable, strong) IBOutlet NSButton *selectAllButton;
Modified: trunk/bibdesk/BDSKMergeController.m
===================================================================
--- trunk/bibdesk/BDSKMergeController.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKMergeController.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -96,7 +96,7 @@
}
- (instancetype)initWithPublication:(BibItem *)pub mergedPublication:(BibItem
*)mergedPub fromDocument:(BibDocument *)doc completionHandler:(void (^)(BOOL
didMerge, BDSKAutoGenerateStatus status))handler {
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
publication = pub;
document = doc;
Modified: trunk/bibdesk/BDSKNotesWindowController.h
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKNotesWindowController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -55,8 +55,11 @@
NSButton *openInSkimButton;
}
-- (instancetype)initWithURL:(NSURL *)aURL;
+- (instancetype)initWithURL:(NSURL *)aURL NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSOutlineView *outlineView;
@property (nonatomic, nullable, strong) IBOutlet NSTokenField *tokenField;
@property (nonatomic, nullable, strong) IBOutlet NSSplitView *splitView;
Modified: trunk/bibdesk/BDSKNotesWindowController.m
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKNotesWindowController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -57,7 +57,7 @@
@synthesize outlineView, tokenField, splitView, ownerController,
refreshButton, openInSkimButton, tags, rating;
- (instancetype)initWithURL:(NSURL *)aURL {
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
if (aURL == nil) {
self = nil;
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKPersonController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -68,8 +68,11 @@
}
#pragma mark initialization
-- (instancetype)initWithPerson:(BibAuthor *)aPerson;
+- (instancetype)initWithPerson:(BibAuthor *)aPerson NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
#pragma mark accessors
@property (nonatomic, nullable, strong) IBOutlet NSTextField *nameTextField;
@property (nonatomic, nullable, strong) IBOutlet BDSKDragImageView *imageView;
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKPersonController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -72,7 +72,7 @@
- (instancetype)initWithPerson:(BibAuthor *)aPerson{
- self = [super init];
+ self = [super initWithWindow:nil];
if(self){
// get this first and save it, as the person may become invalid later
owner = [[aPerson publication] owner];
Modified: trunk/bibdesk/BDSKPreferencePane.h
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.h 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKPreferencePane.h 2025-10-02 09:15:47 UTC (rev 29651)
@@ -49,8 +49,11 @@
NSMutableDictionary *dependentKeys;
}
-- (instancetype)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController;
+- (instancetype)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, readonly) BDSKPreferenceController *preferenceController;
@property (nonatomic, readonly) BDSKPreferenceRecord *record;
Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKPreviewer.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -87,7 +87,7 @@
}
- (instancetype)init{
- if(self = [super init]){
+ if(self = [super initWithWindow:nil]){
// this reflects the currently expected state, not necessarily the
actual state
// it corresponds to the last drawing item added to the mainQueue
previewState = BDSKPreviewStateUnknown;
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.h 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.h 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -54,8 +54,11 @@
BDSKFieldEditor *dragFieldEditor;
}
-- (instancetype)initWithPath:(nullable NSString *)aPath arguments:(nullable
NSString *)anArguments;
+- (instancetype)initWithPath:(nullable NSString *)aPath arguments:(nullable
NSString *)anArguments NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet BDSKDragTextField *pathField;
@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -58,7 +58,7 @@
}
- (instancetype)initWithPath:(NSString *)aPath arguments:(NSString
*)anArguments {
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
path = aPath;
arguments = anArguments;
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -78,8 +78,11 @@
NSObjectController *objectController;
}
-- (instancetype)initWithServerInfo:(nullable BDSKServerInfo *)aServerInfo;
+- (instancetype)initWithServerInfo:(nullable BDSKServerInfo *)aServerInfo
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSPopUpButton *serverPopup;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *nameField;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *addressField;
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -81,7 +81,7 @@
}
- (instancetype)initWithServerInfo:(BDSKServerInfo *)aServerInfo {
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
undoManager = nil;
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -48,7 +48,7 @@
@synthesize searchField, searchButton;
@dynamic group;
-- (instancetype)init {
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
return [super initWithNibName:@"BDSKSearchGroupView" bundle:nil];
}
Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKTextImportController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -101,8 +101,11 @@
NSResponder *savedFirstResponder;
}
-- (instancetype)initForOwner:(id <BDSKOwner>)anOwner;
+- (instancetype)initForOwner:(id <BDSKOwner>)anOwner NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet NSTextView* sourceTextView;
@property (nonatomic, nullable, strong) IBOutlet BDSKTextImportItemTableView*
itemTableView;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *citeKeyField;
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKTextImportController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -155,7 +155,7 @@
@dynamic publication;
- (instancetype)initForOwner:(id <BDSKOwner>)anOwner {
- self = [super initWithWindowNibName:[self windowNibName]];
+ self = [super initWithWindow:nil];
if(self){
owner = anOwner;
publications = [[owner publications] copyTemporary];
Modified: trunk/bibdesk/BDSKTextViewCompletionController.h
===================================================================
--- trunk/bibdesk/BDSKTextViewCompletionController.h 2025-10-01 22:10:27 UTC
(rev 29650)
+++ trunk/bibdesk/BDSKTextViewCompletionController.h 2025-10-02 09:15:47 UTC
(rev 29651)
@@ -51,6 +51,10 @@
BOOL shouldInsert;
}
+- (instancetype)init NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (class, nonatomic, readonly) BDSKTextViewCompletionController
*sharedController;
@property (nonatomic, strong, nullable, readonly) NSTextView *currentTextView;
Modified: trunk/bibdesk/BDSKTouchBarButtonGroup.h
===================================================================
--- trunk/bibdesk/BDSKTouchBarButtonGroup.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKTouchBarButtonGroup.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -46,8 +46,11 @@
@property (nonatomic, readonly) NSArray *buttons;
-- (instancetype)initByReferencingButtons:(NSArray *)refButtons;
+- (instancetype)initByReferencingButtons:(NSArray *)refButtons
NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
bundle:(nullable NSBundle *)nibBundleOrNil NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@end
NS_ASSUME_NONNULL_END
Modified: trunk/bibdesk/BDSKTouchBarButtonGroup.m
===================================================================
--- trunk/bibdesk/BDSKTouchBarButtonGroup.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKTouchBarButtonGroup.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -43,7 +43,7 @@
@synthesize buttons;
- (instancetype)initByReferencingButtons:(NSArray *)refButtons {
- self = [super init];
+ self = [super initWithNibName:nil bundle:nil];
if (self) {
NSView *buttonGroup = [[NSView alloc] initWithFrame:NSZeroRect];
Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m 2025-10-01 22:10:27 UTC (rev 29650)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m 2025-10-02 09:15:47 UTC (rev 29651)
@@ -67,7 +67,7 @@
- (instancetype)init
{
BDSKPRECONDITION(sharedTypeInfoEditor == nil);
- self = [super initWithWindowNibName:@"BDSKTypeInfoEditor"];
+ self = [super initWithWindow:nil];
if (self) {
canEditDefaultTypes = NO;
@@ -78,6 +78,10 @@
return self;
}
+- (NSString *)windowNibName {
+ return @"BDSKTypeInfoEditor";
+}
+
- (void)windowDidLoad
{
// we want to be able to reorder the items
Modified: trunk/bibdesk/BDSKURLGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.h 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKURLGroupSheetController.h 2025-10-02 09:15:47 UTC (rev
29651)
@@ -54,8 +54,11 @@
CFArrayRef editors;
}
-- (instancetype)initWithURL:(nullable NSURL *)aURL;
+- (instancetype)initWithURL:(nullable NSURL *)aURL NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithWindow:(nullable NSWindow *)window NS_UNAVAILABLE;
+- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
+
@property (nonatomic, nullable, strong) IBOutlet BDSKDragTextField *urlField;
@property (nonatomic, nullable, strong) IBOutlet NSObjectController
*objectController;
@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton;
Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -61,7 +61,7 @@
}
- (instancetype)initWithURL:(NSURL *)aURL {
- self = [super init];
+ self = [super initWithWindow:nil];
if (self) {
urlString = [aURL absoluteString];
undoManager = nil;
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2025-10-01 22:10:27 UTC (rev
29650)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2025-10-02 09:15:47 UTC (rev
29651)
@@ -65,7 +65,7 @@
@synthesize urlField, backForwardButton;
@dynamic webView;
-- (instancetype)init {
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
self = [super initWithNibName:@"BDSKWebGroupView" bundle: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
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
