Revision: 24029
http://sourceforge.net/p/bibdesk/svn/24029
Author: hofman
Date: 2019-07-15 17:50:47 +0000 (Mon, 15 Jul 2019)
Log Message:
-----------
use properties for controller classes
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.h
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKBookmarkSheetController.h
trunk/bibdesk/BDSKBookmarkSheetController.m
trunk/bibdesk/BDSKCharacterConversion.h
trunk/bibdesk/BDSKCharacterConversion.m
trunk/bibdesk/BDSKComplexStringEditor.h
trunk/bibdesk/BDSKComplexStringEditor.m
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKConditionController.m
trunk/bibdesk/BDSKCustomCiteDrawerController.h
trunk/bibdesk/BDSKCustomCiteDrawerController.m
trunk/bibdesk/BDSKDocumentController.h
trunk/bibdesk/BDSKDocumentController.m
trunk/bibdesk/BDSKDocumentInfoWindowController.h
trunk/bibdesk/BDSKDocumentInfoWindowController.m
trunk/bibdesk/BDSKEditor.h
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKErrorManager.h
trunk/bibdesk/BDSKErrorManager.m
trunk/bibdesk/BDSKErrorObjectController.h
trunk/bibdesk/BDSKErrorObjectController.m
trunk/bibdesk/BDSKFieldSheetController.h
trunk/bibdesk/BDSKFieldSheetController.m
trunk/bibdesk/BDSKFileContentSearchController.h
trunk/bibdesk/BDSKFileContentSearchController.m
trunk/bibdesk/BDSKFileMatchConfigController.h
trunk/bibdesk/BDSKFileMatchConfigController.m
trunk/bibdesk/BDSKFilterController.h
trunk/bibdesk/BDSKFilterController.m
trunk/bibdesk/BDSKFindController.h
trunk/bibdesk/BDSKFindController.m
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKNotesWindowController.h
trunk/bibdesk/BDSKNotesWindowController.m
trunk/bibdesk/BDSKOpenAccessoryViewController.h
trunk/bibdesk/BDSKOpenAccessoryViewController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.h
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BDSKPreferenceController.h
trunk/bibdesk/BDSKPreferenceController.m
trunk/bibdesk/BDSKPreferencePane.h
trunk/bibdesk/BDSKPreferencePane.m
trunk/bibdesk/BDSKPreviewer.h
trunk/bibdesk/BDSKPreviewer.m
trunk/bibdesk/BDSKSaveAccessoryViewController.h
trunk/bibdesk/BDSKSaveAccessoryViewController.m
trunk/bibdesk/BDSKScriptGroupSheetController.h
trunk/bibdesk/BDSKScriptGroupSheetController.m
trunk/bibdesk/BDSKSearchBookmarkController.h
trunk/bibdesk/BDSKSearchBookmarkController.m
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupViewController.h
trunk/bibdesk/BDSKSearchGroupViewController.m
trunk/bibdesk/BDSKTemplateDocument.h
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTextImportController.h
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTextViewCompletionController.h
trunk/bibdesk/BDSKTextViewCompletionController.m
trunk/bibdesk/BDSKTypeInfoEditor.h
trunk/bibdesk/BDSKTypeInfoEditor.m
trunk/bibdesk/BDSKURLGroupSheetController.h
trunk/bibdesk/BDSKURLGroupSheetController.m
trunk/bibdesk/BDSKURLSheetController.h
trunk/bibdesk/BDSKURLSheetController.m
trunk/bibdesk/BDSKWebGroupViewController.h
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/BDSKWebViewModalDialogController.h
trunk/bibdesk/BDSKWebViewModalDialogController.m
Modified: trunk/bibdesk/BDSKBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKBookmarkController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -53,7 +53,7 @@
+ (id)sharedBookmarkController;
-- (BDSKBookmark *)bookmarkRoot;
+@property (nonatomic, readonly) BDSKBookmark *bookmarkRoot;
- (void)addBookmarkWithURL:(NSURL *)aURL proposedName:(NSString *)name
modalForWindow:(NSWindow *)window;
@@ -62,6 +62,6 @@
- (IBAction)insertBookmarkSeparator:(id)sender;
- (IBAction)deleteBookmark:(id)sender;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKBookmarkController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -83,6 +83,9 @@
@implementation BDSKBookmarkController
+@synthesize bookmarkRoot;
+@dynamic undoManager;
+
static id sharedBookmarkController = nil;
+ (id)sharedBookmarkController {
@@ -130,10 +133,6 @@
}
-- (BDSKBookmark *)bookmarkRoot {
- return bookmarkRoot;
-}
-
static NSArray *minimumCoverForBookmarks(NSArray *items) {
BDSKBookmark *lastBm = nil;
NSMutableArray *minimalCover = [NSMutableArray array];
Modified: trunk/bibdesk/BDSKBookmarkSheetController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkSheetController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKBookmarkSheetController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -47,13 +47,12 @@
IBOutlet NSButton *cancelButton;
}
-- (NSTextField *)textField;
+@property (nonatomic, readonly) NSTextField *textField;
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)string;
+@property (nonatomic, retain) NSString *stringValue;
-- (NSPopUpButton *)folderPopUpButton;
+@property (nonatomic, readonly) NSPopUpButton *folderPopUpButton;
-- (id)selectedFolder;
+@property (nonatomic, readonly) id selectedFolder;
@end
Modified: trunk/bibdesk/BDSKBookmarkSheetController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkSheetController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKBookmarkSheetController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -43,6 +43,8 @@
@implementation BDSKBookmarkSheetController
+@dynamic textField, stringValue, folderPopUpButton, selectedFolder;
+
- (NSString *)windowNibName { return @"BookmarkSheet"; }
- (NSTextField *)textField {
Modified: trunk/bibdesk/BDSKCharacterConversion.h
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKCharacterConversion.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -39,6 +39,10 @@
#import <Cocoa/Cocoa.h>
#import "NSTouchBar_BDSKForwardDeclarations.h"
+typedef NS_ENUM(NSInteger, BDSKListType) {
+ BDSKListTypeOneWay = 1,
+ BDSKListTypeTwoWay = 2
+};
@interface BDSKCharacterConversion : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSTouchBarDelegate> {
IBOutlet NSPopUpButton *listButton;
@@ -68,12 +72,9 @@
- (IBAction)changeList:(id)sender;
- (IBAction)addRemove:(id)sender;
-- (NSInteger)listType;
-- (void)setListType:(NSInteger)newListType;
-- (NSDictionary *)oneWayDict;
-- (void)setOneWayDict:(NSDictionary *)newOneWayDict;
-- (NSDictionary *)twoWayDict;
-- (void)setTwoWayDict:(NSDictionary *)newTwoWayDict;
+@property (nonatomic) BDSKListType listType;
+@property (nonatomic, copy) NSDictionary *oneWayDict;
+@property (nonatomic, copy) NSDictionary *twoWayDict;
- (void)updateButtons;
- (void)finalizeChangesIgnoringEdit:(BOOL)flag;
Modified: trunk/bibdesk/BDSKCharacterConversion.m
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKCharacterConversion.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -48,6 +48,8 @@
@implementation BDSKCharacterConversion
+@dynamic listType, oneWayDict, twoWayDict;
+
static BDSKCharacterConversion *sharedConversionEditor;
+ (BDSKCharacterConversion *)sharedConversionEditor{
@@ -122,11 +124,11 @@
#pragma mark Acessors
-- (NSInteger)listType {
- return (currentDict == oneWayDict)? 1 : 2;
+- (BDSKListType)listType {
+ return (currentDict == oneWayDict)? BDSKListTypeOneWay :
BDSKListTypeTwoWay;
}
-- (void)setListType:(NSInteger)listType {
+- (void)setListType:(BDSKListType)listType {
if ([self listType] == listType)
return;
if (!validRoman || !validTex) {
@@ -139,7 +141,7 @@
return;
}
- currentDict = (listType == 1)? oneWayDict : twoWayDict;
+ currentDict = (listType == BDSKListTypeOneWay)? oneWayDict : twoWayDict;
[currentArray autorelease];
currentArray = [[currentDict allKeys] mutableCopy];
@@ -147,7 +149,7 @@
validTex = YES;
NSTableColumn *tc = [tableView tableColumnWithIdentifier:@"tex"];
- if (listType == 2) {
+ if (listType == BDSKListTypeTwoWay) {
[[tc dataCell] setFormatter:texFormatter];
} else {
[[tc dataCell] setFormatter:nil];
@@ -242,7 +244,7 @@
[currentDict setObject:newTex forKey:newRoman];
validRoman = NO;
- validTex = ([self listType] == 1);
+ validTex = ([self listType] == BDSKListTypeOneWay);
[tableView reloadData];
@@ -264,7 +266,7 @@
[currentDict removeObjectForKey:oldRoman];
if (validRoman)
[romanSet removeObject:oldRoman];
- if ([self listType] == 2 && validTex)
+ if ([self listType] == BDSKListTypeTwoWay && validTex)
[texSet removeObject:oldTex];
validRoman = YES;
@@ -360,7 +362,7 @@
}
else {
if (!validTex || ![object isEqualToString:tex]) {
- if ([self listType] == 2 && [texSet
containsObject:object]) {
+ if ([self listType] == BDSKListTypeTwoWay && [texSet
containsObject:object]) {
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText:NSLocalizedString(@"Duplicate TeX
Conversion", @"Message in alert dialog when entering duplicate TeX
conversion")];
[alert setInformativeText:[NSString
stringWithFormat:NSLocalizedString(@"The TeX conversion %@ you entered already
has a Unicode character.", @"Informative text in alert dialog"), object]];
@@ -379,7 +381,7 @@
}
if (rv == NSAlertFirstButtonReturn) {
[currentDict setObject:object forKey:roman];
- if ([self listType] == 2) {
+ if ([self listType] == BDSKListTypeTwoWay) {
if (validTex)
[texSet removeObject:tex];
[texSet addObject:object];
Modified: trunk/bibdesk/BDSKComplexStringEditor.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKComplexStringEditor.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -55,6 +55,6 @@
- (BOOL)attachToTableView:(NSTableView *)aTableView atRow:(NSInteger)aRow
column:(NSInteger)aColumn withValue:(NSString *)aString;
-- (BOOL)isAttached;
+@property (nonatomic, readonly, getter=isAttached) BOOL attached;
@end
Modified: trunk/bibdesk/BDSKComplexStringEditor.m
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKComplexStringEditor.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -60,6 +60,8 @@
@implementation BDSKComplexStringEditor
+@dynamic attached;
+
- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver
enabled:(BOOL)isEnabled {
self = [super initWithWindowNibName:@"ComplexStringEditor"];
if (self) {
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKConditionController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -78,12 +78,11 @@
- (IBAction)changeRating:(id)sender;
- (IBAction)selectKeyText:(id)sender;
-- (BDSKCondition *)condition;
+@property (nonatomic, readonly) BDSKCondition *condition;
-- (BOOL)canRemove;
-- (void)setCanRemove:(BOOL)flag;
+@property (nonatomic) BOOL canRemove;
-- (NSArray *)keys;
+@property (nonatomic, readonly) NSArray *keys;
- (void)startObserving;
- (void)stopObserving;
Modified: trunk/bibdesk/BDSKConditionController.m
===================================================================
--- trunk/bibdesk/BDSKConditionController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKConditionController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -58,6 +58,9 @@
@implementation BDSKConditionController
+@synthesize canRemove;
+@dynamic condition, keys;
+
+ (void)initialize
{
BDSKINITIALIZE;
@@ -168,14 +171,6 @@
return [self representedObject];
}
-- (BOOL)canRemove {
- return canRemove;
-}
-
-- (void)setCanRemove:(BOOL)flag {
- canRemove = flag;
-}
-
- (NSArray *)keys {
return [[keys copy] autorelease];
}
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.h
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -40,7 +40,7 @@
@class BibDocument;
@interface BDSKCustomCiteDrawerController : NSViewController
<NSTableViewDelegate, NSTableViewDataSource, NSMenuDelegate> {
- IBOutlet NSTableView *tableView;
+ NSTableView *tableView;
BibDocument *document;
NSMutableArray *customStringArray;
}
@@ -47,9 +47,9 @@
- (id)initForDocument:(BibDocument *)aDocument;
-- (NSTableView *)tableView;
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
-- (CGFloat)contentWidth;
+@property (nonatomic, readonly) CGFloat contentWidth;
- (IBAction)add:(id)sender;
- (IBAction)remove:(id)sender;
Modified: trunk/bibdesk/BDSKCustomCiteDrawerController.m
===================================================================
--- trunk/bibdesk/BDSKCustomCiteDrawerController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKCustomCiteDrawerController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -45,6 +45,9 @@
@implementation BDSKCustomCiteDrawerController
+@synthesize tableView;
+@dynamic contentWidth;
+
- (id)initForDocument:(BibDocument *)aDocument{
if(self = [super init]){
customStringArray = [[NSMutableArray arrayWithCapacity:6]
retain];
@@ -80,10 +83,6 @@
[tableView setDraggingSourceOperationMask:NSDragOperationCopy forLocal:NO];
}
-- (NSTableView *)tableView{
- return tableView;
-}
-
- (CGFloat)contentWidth {
NSInteger row, numRows = [tableView numberOfRows];
id cell;
Modified: trunk/bibdesk/BDSKDocumentController.h
===================================================================
--- trunk/bibdesk/BDSKDocumentController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKDocumentController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -53,11 +53,12 @@
BOOL openedFile;
}
-- (BOOL)autosavesInPlace;
+@property (nonatomic, readonly) BOOL autosavesInPlace;
-- (BOOL)openedFile;
+@property (nonatomic, readonly) BOOL openedFile;
-- (id)mainDocument;
+@property (nonatomic, readonly) id mainDocument;
+
- (BibDocument *)currentBibliographyDocumentAndDisplay:(BOOL)display
error:(NSError **)outError;
- (NSStringEncoding)lastSelectedEncodingForURL:(NSURL *)aURL;
Modified: trunk/bibdesk/BDSKDocumentController.m
===================================================================
--- trunk/bibdesk/BDSKDocumentController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKDocumentController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -94,6 +94,8 @@
@implementation BDSKDocumentController
+@synthesize autosavesInPlace, openedFile, mainDocument;
+
- (id)init {
if ((self = [super init]) && didInitialize == NO) {
[[NSNotificationCenter defaultCenter] addObserver:self
@@ -116,18 +118,6 @@
return self;
}
-- (BOOL)autosavesInPlace {
- return autosavesInPlace;
-}
-
-- (BOOL)openedFile {
- return openedFile;
-}
-
-- (id)mainDocument {
- return mainDocument;
-}
-
- (BibDocument *)currentBibliographyDocumentAndDisplay:(BOOL)display
error:(NSError **)outError {
// try the main document first
id document = [[[NSScriptCommand currentCommand] subjectSpecifier]
objectsByEvaluatingSpecifier];
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.h
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -52,7 +52,6 @@
- (IBAction)addRemoveKey:(id)sender;
-- (void)setInfo:(NSDictionary *)newInfo;
-- (NSDictionary *)info;
+@property (nonatomic, copy) NSDictionary *info;
@end
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.m
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -46,6 +46,8 @@
@implementation BDSKDocumentInfoWindowController
+@synthesize info;
+
- (id)init {
self = [super initWithWindowNibName:@"DocumentInfoWindow"];
if (self) {
@@ -97,10 +99,6 @@
[self refreshKeys];
}
-- (NSDictionary *)info {
- return info;
-}
-
#pragma mark Button actions
- (IBAction)dismiss:(id)sender{
Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKEditor.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -142,7 +142,7 @@
*/
- (id)initWithPublication:(BibItem *)aBib;
-- (BibItem *)publication;
+@property (nonatomic, readonly) BibItem *publication;
- (IBAction)chooseLocalFile:(id)sender;
@@ -177,8 +177,7 @@
- (NSInteger)userChangedField:(NSString *)fieldName from:(NSString *)oldValue
to:(NSString *)newValue;
- (NSInteger)userChangedField:(NSString *)fieldName from:(NSString *)oldValue
to:(NSString *)newValue didAutoGenerate:(NSInteger)mask;
-- (NSString *)status;
-- (void)setStatus:(NSString *)status;
+@property (nonatomic, retain) NSString *status;
- (IBAction)openLinkedFile:(id)sender;
@@ -228,7 +227,7 @@
@discussion (comprehensive description)
@result (description)
*/
-- (NSMenu *)recentDownloadsMenu;
+@property (nonatomic, readonly) NSMenu *recentDownloadsMenu;
- (void)updateContextMenu:(NSMenu *)menu;
@@ -293,8 +292,7 @@
*/
- (IBAction)duplicateTitleToBooktitle:(id)sender;
-- (NSString *)keyField;
-- (void)setKeyField:(NSString *)fieldName;
+@property (nonatomic, retain) NSString *keyField;
- (void)bibDidChange:(NSNotification *)notification;
- (void)typeInfoDidChange:(NSNotification *)aNotification;
@@ -311,7 +309,7 @@
- (IBAction)tableButtonAction:(id)sender;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
- (void)deleteURLsAtIndexes:(NSIndexSet *)indexSet
moveToTrash:(NSInteger)moveToTrash;
@@ -322,9 +320,9 @@
- (IBAction)showPersonDetail:(id)sender;
-- (NSInteger)numberOfPersons;
+@property (nonatomic, readonly) NSInteger numberOfPersons;
- (BibAuthor *)personAtIndex:(NSUInteger)anIndex;
-- (NSArray *)persons;
+@property (nonatomic, readonly) NSArray *persons;
#pragma mark Macro support
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKEditor.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -127,6 +127,9 @@
@implementation BDSKEditor
+@synthesize publication;
+@dynamic status, recentDownloadsMenu, keyField, undoManager, numberOfPersons,
persons;
+
+ (void)initialize
{
BDSKINITIALIZE;
@@ -311,10 +314,6 @@
[[self window] setRepresentedFilename:[[[publication localFiles]
firstObject] path] ?: @""];
}
-- (BibItem *)publication{
- return publication;
-}
-
- (void)dealloc{
BDSKDESTROY(publication);
BDSKDESTROY(fields);
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKErrorEditor.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -65,17 +65,14 @@
// for editing Paste/Drag data
- (id)initWithPasteDragData:(NSData *)aData;
-- (BDSKErrorManager *)manager;
-- (void)setManager:(BDSKErrorManager *)newManager;
+@property (nonatomic, retain) BDSKErrorManager *manager;
-- (NSArray *)errors;
-- (void)setErrors:(NSArray *)newErrors;
+@property (nonatomic, copy) NSArray *errors;
-- (NSURL *)fileURL;
-- (void)setFileURL:(NSURL *)newFileURL;
-- (NSString *)displayName;
-- (NSData *)pasteDragData;
-- (BOOL)isPasteDrag;
+@property (nonatomic, retain) NSURL *fileURL;
+@property (nonatomic, readonly) NSString *displayName;
+@property (nonatomic, readonly) NSData *pasteDragData;
+@property (nonatomic, readonly) BOOL isPasteDrag;
- (void)updateDisplayName;
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKErrorEditor.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -67,6 +67,8 @@
@implementation BDSKErrorEditor
+@synthesize manager, errors, fileURL, displayName, pasteDragData, isPasteDrag;
+
static NSColor *quoteColor = nil;
static NSColor *delimColor = nil;
static NSColor *typeColor = nil;
@@ -206,11 +208,6 @@
#pragma mark Accessors
-- (BDSKErrorManager *)manager;
-{
- return manager;
-}
-
- (void)setManager:(BDSKErrorManager *)newManager;
{
if(manager != newManager){
@@ -223,11 +220,6 @@
}
}
-- (NSArray *)errors;
-{
- return errors;
-}
-
- (void)setErrors:(NSArray *)newErrors;
{
if (errors != newErrors) {
@@ -238,24 +230,6 @@
}
}
-- (NSURL *)fileURL;
-{
- return fileURL;
-}
-
-- (void)setFileURL:(NSURL *)newFileURL;
-{
- if (fileURL != newFileURL) {
- [fileURL release];
- [fileURL retain];
- }
-}
-
-- (NSString *)displayName;
-{
- return displayName;
-}
-
- (void)updateDisplayName {
[self willChangeValueForKey:@"displayName"];
NSString *newDisplayName = [manager displayName];
@@ -283,16 +257,6 @@
}
}
-- (NSData *)pasteDragData;
-{
- return data;
-}
-
-- (BOOL)isPasteDrag;
-{
- return isPasteDrag;
-}
-
- (void)updateErrorMarkers;
{
NSRulerView *ruler = [[textView enclosingScrollView] verticalRulerView];
Modified: trunk/bibdesk/BDSKErrorManager.h
===================================================================
--- trunk/bibdesk/BDSKErrorManager.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKErrorManager.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -54,23 +54,20 @@
- (id)initWithDocument:(BibDocument *)aDocument;
-- (BDSKErrorObjectController *)errorController;
-- (void)setErrorController:(BDSKErrorObjectController *)newController;
+@property (nonatomic, assign) BDSKErrorObjectController *errorController;
-- (BibDocument *)sourceDocument;
-- (void)setSourceDocument:(BibDocument *)newDocument;
+@property (nonatomic, retain) BibDocument *sourceDocument;
-- (NSInteger)uniqueNumber;
-- (NSString *)documentDisplayName;
-- (void)setDocumentDisplayName:(NSString *)newName;
-- (NSString *)displayName;
-- (NSStringEncoding)documentStringEncoding;
+@property (nonatomic, readonly) NSInteger uniqueNumber;
+@property (nonatomic, retain) NSString *documentDisplayName;
+@property (nonatomic, readonly) NSString *displayName;
+@property (nonatomic, readonly) NSStringEncoding documentStringEncoding;
- (void)updateDisplayName;
-- (BDSKErrorEditor *)mainEditor;
+@property (nonatomic, readonly) BDSKErrorEditor *mainEditor;
-- (NSArray *)editors;
+@property (nonatomic, readonly) NSArray *editors;
- (void)addEditor:(BDSKErrorEditor *)editor;
- (void)removeEditor:(BDSKErrorEditor *)editor;
Modified: trunk/bibdesk/BDSKErrorManager.m
===================================================================
--- trunk/bibdesk/BDSKErrorManager.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKErrorManager.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -48,6 +48,9 @@
@implementation BDSKErrorManager
+@synthesize errorController, sourceDocument, uniqueNumber,
documentDisplayName, mainEditor, editors;
+@dynamic displayName, documentStringEncoding;
+
+ (id)allItemsErrorManager;
{
static BDSKErrorManager *allItemsErrorManager = nil;
@@ -87,11 +90,6 @@
[super dealloc];
}
-- (BDSKErrorObjectController *)errorController;
-{
- return errorController;
-}
-
- (void)setErrorController:(BDSKErrorObjectController *)newController;
{
if(errorController != newController){
@@ -100,11 +98,6 @@
}
}
-- (BibDocument *)sourceDocument;
-{
- return document;
-}
-
- (void)setSourceDocument:(BibDocument *)newDocument;
{
if (document != newDocument) {
@@ -122,16 +115,6 @@
}
}
-- (NSInteger)uniqueNumber;
-{
- return uniqueNumber;
-}
-
-- (NSString *)documentDisplayName;
-{
- return documentDisplayName;
-}
-
- (void)setDocumentDisplayName:(NSString *)newName;
{
if(newName != documentDisplayName){
@@ -183,16 +166,6 @@
}
}
-- (BDSKErrorEditor *)mainEditor;
-{
- return mainEditor;
-}
-
-- (NSArray *)editors;
-{
- return editors;
-}
-
- (void)addEditor:(BDSKErrorEditor *)editor;
{
[editor setManager:self];
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -72,10 +72,8 @@
- (void)addManager:(BDSKErrorManager *)manager;
- (void)removeManager:(BDSKErrorManager *)manager;
-- (BDSKErrorManager *)filterManager;
-- (void)setFilterManager:(BDSKErrorManager *)manager;
-- (BOOL)hideWarnings;
-- (void)setHideWarnings:(BOOL)flag;
+@property (nonatomic, retain) BDSKErrorManager *filterManager;
+@property (nonatomic) BOOL hideWarnings;
// called from the tableView doubleclick
- (void)showEditorForErrorObject:(BDSKErrorObject *)errObj;
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -62,6 +62,8 @@
@implementation BDSKErrorObjectController
+@synthesize filterManager, hideWarnings;
+
static BDSKErrorObjectController *sharedErrorObjectController = nil;
+ (void)initialize;
@@ -201,10 +203,6 @@
#pragma mark | filters
-- (BDSKErrorManager *)filterManager {
- return filterManager;
-}
-
- (void)setFilterManager:(BDSKErrorManager *)manager {
if (filterManager != manager) {
[filterManager release];
@@ -213,10 +211,6 @@
}
}
-- (BOOL)hideWarnings {
- return hideWarnings;
-}
-
- (void)setHideWarnings:(BOOL)flag {
if(hideWarnings != flag) {
hideWarnings = flag;
Modified: trunk/bibdesk/BDSKFieldSheetController.h
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKFieldSheetController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -62,28 +62,15 @@
+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel;
+ (id)fieldSheetControllerWithChoosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel;
-- (NSString *)selectedField;
-- (void)setSelectedField:(NSString *)newField;
+@property (nonatomic, retain) NSString *selectedField;
+@property (nonatomic, retain) NSString *selectedFieldLabel;
+@property (nonatomic, copy) NSArray *selectableFields;
-- (NSString *)selectedFieldLabel;
-- (void)setSelectedFieldLabel:(NSString *)newLabel;
+@property (nonatomic, retain) NSString *chosenField;
+@property (nonatomic, retain) NSString *chosenFieldLabel;
+@property (nonatomic, copy) NSArray *choosableFields;
-- (NSArray *)selectableFields;
-- (void)setSelectableFields:(NSArray *)array;
+@property (nonatomic, retain) NSString *defaultButtonTitle;
+@property (nonatomic, retain) NSString *cancelButtonTitle;
-- (NSString *)chosenField;
-- (void)setChosenField:(NSString *)newField;
-
-- (NSString *)chosenFieldLabel;
-- (void)setChosenFieldLabel:(NSString *)newLabel;
-
-- (NSArray *)choosableFields;
-- (void)setChoosableFields:(NSArray *)array;
-
-- (NSString *)defaultButtonTitle;
-- (void)setDefaultButtonTitle:(NSString *)title;
-
-- (NSString *)cancelButtonTitle;
-- (void)setCancelButtonTitle:(NSString *)title;
-
@end
Modified: trunk/bibdesk/BDSKFieldSheetController.m
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKFieldSheetController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -45,6 +45,8 @@
@implementation BDSKFieldSheetController
+@synthesize selectedField, selectedFieldLabel, selectableFields, chosenField,
chosenFieldLabel, choosableFields, defaultButtonTitle, cancelButtonTitle;
+
+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel choosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel {
BDSKFieldSheetController *controller = [[[self alloc] init] autorelease];
[controller setSelectableFields:selectableFields];
@@ -93,32 +95,6 @@
[chosenFieldComboBox setFormatter:formatter];
}
-- (NSString *)selectedField {
- return selectedField;
-}
-
-- (void)setSelectedField:(NSString *)newField {
- if (selectedField != newField) {
- [selectedField release];
- selectedField = [newField retain];
- }
-}
-
-- (NSString *)selectedFieldLabel {
- return selectedFieldLabel;
-}
-
-- (void)setSelectedFieldLabel:(NSString *)newLabel {
- if (selectedFieldLabel != newLabel) {
- [selectedFieldLabel release];
- selectedFieldLabel = [newLabel retain];
- }
-}
-
-- (NSArray *)selectableFields {
- return selectableFields;
-}
-
- (void)setSelectableFields:(NSArray *)array {
if (selectableFields != array) {
[selectableFields release];
@@ -128,32 +104,6 @@
}
}
-- (NSString *)chosenField {
- return chosenField;
-}
-
-- (void)setChosenField:(NSString *)newField {
- if (chosenField != newField) {
- [chosenField release];
- chosenField = [newField retain];
- }
-}
-
-- (NSString *)chosenFieldLabel {
- return chosenFieldLabel;
-}
-
-- (void)setChosenFieldLabel:(NSString *)newLabel {
- if (chosenFieldLabel != newLabel) {
- [chosenFieldLabel release];
- chosenFieldLabel = [newLabel retain];
- }
-}
-
-- (NSArray *)choosableFields {
- return choosableFields;
-}
-
- (void)setChoosableFields:(NSArray *)array {
if (choosableFields != array) {
[choosableFields release];
@@ -162,28 +112,6 @@
}
}
-- (NSString *)defaultButtonTitle {
- return defaultButtonTitle;
-}
-
-- (void)setDefaultButtonTitle:(NSString *)title{
- if (defaultButtonTitle != title) {
- [defaultButtonTitle release];
- defaultButtonTitle = [title retain];
- }
-}
-
-- (NSString *)cancelButtonTitle {
- return cancelButtonTitle;
-}
-
-- (void)setCancelButtonTitle:(NSString *)title {
- if (cancelButtonTitle != title) {
- [cancelButtonTitle release];
- cancelButtonTitle = [title retain];
- }
-}
-
#define MIN_BUTTON_WIDTH 82.0
#define MAX_BUTTON_WIDTH 100.0
#define EXTRA_BUTTON_WIDTH 12.0
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKFileContentSearchController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -85,39 +85,33 @@
// Use this method to instantiate a search controller for use within a
document window
- (id)initForOwner:(id<BDSKOwner>)owner;
-- (id<BDSKFileContentSearchControllerDelegate>)delegate;
-- (void)setDelegate:(id<BDSKFileContentSearchControllerDelegate>)newDelegate;
+@property (nonatomic, assign) id<BDSKFileContentSearchControllerDelegate>
delegate;
-- (NSView *)controlView;
-- (NSTableView *)tableView;
+@property (nonatomic, readonly) NSView *controlView;
+@property (nonatomic, readonly) NSTableView *tableView;
// Use this to connect a search field and initiate a search
-- (NSSearchField *)searchField;
-- (void)setSearchField:(NSSearchField *)aSearchField;
-- (NSArray *)savedRecentSearches;
-- (void)setSavedRecentSearches:(NSArray *)recents;
-- (BOOL)shouldShowControlView;
+@property (nonatomic, retain) NSSearchField *searchField;
+@property (nonatomic, copy) NSArray *savedRecentSearches;
+@property (nonatomic, readonly) BOOL shouldShowControlView;
-- (NSArray *)selectedIdentifierURLs;
-- (NSArray *)selectedURLs;
-- (NSArray *)selectedResults;
+@property (nonatomic, readonly) NSArray *selectedIdentifierURLs;
+@property (nonatomic, readonly) NSArray *selectedURLs;
+@property (nonatomic, readonly) NSArray *selectedResults;
-- (NSArray *)clickedOrSelectedIdentifierURLs;
-- (NSArray *)clickedOrSelectedURLs;
-- (NSArray *)clickedOrSelectedResults;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedIdentifierURLs;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedURLs;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedResults;
- (NSArray *)identifierURLsAtIndexes:(NSIndexSet *)indexes;
- (NSArray *)URLsAtIndexes:(NSIndexSet *)indexes;
- (NSArray *)resultsAtIndexes:(NSIndexSet *)indexes;
-- (NSArray *)results;
-- (void)setResults:(NSArray *)newResults;
-- (NSArray *)filteredResults;
-- (void)setFilteredResults:(NSArray *)newFilteredResults;
+@property (nonatomic, copy) NSArray *results;
+@property (nonatomic, copy) NSArray *filteredResults;
- (void)filterUsingURLs:(NSArray *)newFilterURLs;
-- (NSData *)sortDescriptorData;
-- (void)setSortDescriptorData:(NSData *)data;
+@property (nonatomic, copy) NSData *sortDescriptorData;
- (void)remove;
- (void)resetWithPublications:(NSArray *)pubs;
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -61,6 +61,9 @@
@implementation BDSKFileContentSearchController
+@synthesize delegate, searchField, savedRecentSearches, results,
filteredResults;
+@dynamic controlView, tableView, shouldShowControlView,
selectedIdentifierURLs, selectedURLs, selectedResults,
clickedOrSelectedIdentifierURLs, clickedOrSelectedURLs,
clickedOrSelectedResults, sortDescriptorData;
+
- (id)initForOwner:(id<BDSKOwner>)owner
{
self = [super initWithNibName:@"BDSKFileContentSearch" bundle:nil];
@@ -134,14 +137,6 @@
[indexProgressBar setDoubleValue:[searchIndex progressValue]];
}
-- (id<BDSKFileContentSearchControllerDelegate>)delegate {
- return delegate;
-}
-
-- (void)setDelegate:(id<BDSKFileContentSearchControllerDelegate>)newDelegate {
- delegate = newDelegate;
-}
-
- (NSView *)controlView
{
if(controlView == nil)
@@ -204,11 +199,6 @@
[self setSavedRecentSearches:tmpRecents];
}
-- (NSSearchField *)searchField
-{
- return searchField;
-}
-
- (void)setSearchField:(NSSearchField *)aSearchField
{
if (searchField == aSearchField)
@@ -232,19 +222,6 @@
}
}
-- (NSArray *)savedRecentSearches
-{
- return savedRecentSearches;
-}
-
-- (void)setSavedRecentSearches:(NSArray *)recents
-{
- if (savedRecentSearches != recents) {
- [savedRecentSearches release];
- savedRecentSearches = [recents retain];
- }
-}
-
- (void)controlTextDidEndEditing:(NSNotification *)aNotification
{
// we get this message with an empty string when committing an edit, or
with a non-empty string after clearing the searchfield (use it to see if this
was a cancel action so we can handle it slightly differently in search:)
@@ -306,11 +283,6 @@
}
}
-- (NSArray *)results
-{
- return results;
-}
-
- (void)setFilteredResults:(NSArray *)newFilteredResults
{
if(newFilteredResults != filteredResults){
@@ -319,11 +291,6 @@
}
}
-- (NSArray *)filteredResults
-{
- return filteredResults;
-}
-
- (void)filterUsingURLs:(NSArray *)newFilterURLs;
{
[filterURLs release];
Modified: trunk/bibdesk/BDSKFileMatchConfigController.h
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKFileMatchConfigController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -54,13 +54,14 @@
- (IBAction)selectAllDocuments:(id)sender;
-- (NSArray *)publications;
+@property (nonatomic, readonly) NSArray *publications;
- (void)handleDocumentAddRemove:(NSNotification *)note;
-- (NSArray *)documents;
-- (void)setDocuments:(NSArray *)docs;
+@property (nonatomic, copy) NSArray *documents;
+@property (nonatomic) BOOL useOrphanedFiles;
+
- (NSArray *)files;
- (NSUInteger)countOfFiles;
- (id)objectInFilesAtIndex:(NSUInteger)anIndex;
Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -48,6 +48,9 @@
@implementation BDSKFileMatchConfigController
+@synthesize documents, useOrphanedFiles;
+@dynamic publications;
+
- (id)init
{
self = [super init];
@@ -153,16 +156,6 @@
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
-- (void)setDocuments:(NSArray *)docs;
-{
- if (documents != docs) {
- [documents release];
- documents = [docs copy];
- }
-}
-
-- (NSArray *)documents { return documents; }
-
- (NSArray *)files { return files; }
- (NSUInteger)countOfFiles {
@@ -187,11 +180,6 @@
return [[documents filteredArrayUsingPredicate:predicate]
valueForKeyPath:@"@unionOfArrays.document.publications"];
}
-- (BOOL)useOrphanedFiles;
-{
- return useOrphanedFiles;
-}
-
- (void)orphanedFilesFinderFinished:(NSNotification *)note{
[[NSNotificationCenter defaultCenter] removeObserver:self
name:BDSKOrphanedFilesFinderFinishedNotification
object:[BDSKOrphanedFilesFinder sharedFinder]];
if (useOrphanedFiles)
Modified: trunk/bibdesk/BDSKFilterController.h
===================================================================
--- trunk/bibdesk/BDSKFilterController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKFilterController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -56,21 +56,23 @@
}
- (id)initWithFilter:(BDSKFilter *)aFilter;
+
- (void)updateUI;
+
- (void)insertNewConditionAfter:(BDSKConditionController
*)aConditionController;
- (void)insertConditionController:(BDSKConditionController *)newController
atIndex:(NSUInteger)index;
- (void)removeConditionController:(BDSKConditionController
*)aConditionController;
- (void)removeConditionControllerAtIndex:(NSUInteger)index;
-- (BOOL)canRemoveCondition;
-- (NSArray *)conditionControllers;
-- (BDSKConjunction)conjunction;
-- (void)setConjunction:(BDSKConjunction)newConjunction;
-- (NSArray *)conditions;
+@property (nonatomic, readonly) BOOL canRemoveCondition;
+@property (nonatomic, readonly) NSArray *conditionControllers;
+@property (nonatomic) BDSKConjunction conjunction;
+@property (nonatomic, readonly) NSArray *conditions;
+
- (void)discardEditing;
- (BOOL)commitEditing;
- (void)commitEditingWithDelegate:(id)delegate
didCommitSelector:(SEL)didCommitSelector contextInfo:(void *)contextInfo;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKFilterController.m
===================================================================
--- trunk/bibdesk/BDSKFilterController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKFilterController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -47,6 +47,9 @@
@implementation BDSKFilterController
+@synthesize conjunction;
+@dynamic canRemoveCondition, conditionControllers, conditions;
+
- (id)init
{
BDSKFilter *aFilter = [[BDSKFilter alloc] init];
@@ -183,10 +186,6 @@
return [[conditionControllers copy] autorelease];
}
-- (BDSKConjunction)conjunction {
- return conjunction;
-}
-
- (void)setConjunction:(BDSKConjunction)newConjunction {
[[[self undoManager] prepareWithInvocationTarget:self]
setConjunction:conjunction];
conjunction = newConjunction;
Modified: trunk/bibdesk/BDSKFindController.h
===================================================================
--- trunk/bibdesk/BDSKFindController.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKFindController.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -142,48 +142,21 @@
- (IBAction)openHelp:(id)sender;
-- (BDSKSearchOperation)operation;
-- (void)setOperation:(BDSKSearchOperation)newOperation;
+@property (nonatomic) BDSKSearchOperation operation;
+@property (nonatomic, retain) NSString *field;
+@property (nonatomic, retain) NSString *findString;
+@property (nonatomic, retain) NSString *replaceString;
+@property (nonatomic) BDSKSearchType searchType;
+@property (nonatomic) BDSKSearchScope searchScope;
+@property (nonatomic) BOOL ignoreCase;
+@property (nonatomic) BOOL wrapAround;
+@property (nonatomic) BOOL searchSelection;
+@property (nonatomic) BOOL findAsMacro;
+@property (nonatomic) BOOL replaceAsMacro;
+@property (nonatomic) BOOL shouldSetWhenEmpty;
+@property (nonatomic, retain) NSString *replaceAllTooltip;
+@property (nonatomic, retain) NSString *replaceLabel;
-- (NSString *)field;
-- (void)setField:(NSString *)newFieldName;
-
-- (NSString *)findString;
-- (void)setFindString:(NSString *)newFindString;
-
-- (NSString *)replaceString;
-- (void)setReplaceString:(NSString *)newReplaceString;
-
-- (BDSKSearchType)searchType;
-- (void)setSearchType:(BDSKSearchType)newSearchType;
-
-- (BDSKSearchScope)searchScope;
-- (void)setSearchScope:(BDSKSearchScope)newSearchScope;
-
-- (BOOL)ignoreCase;
-- (void)setIgnoreCase:(BOOL)newIgnoreCase;
-
-- (BOOL)wrapAround;
-- (void)setWrapAround:(BOOL)newWrapAround;
-
-- (BOOL)searchSelection;
-- (void)setSearchSelection:(BOOL)newSearchSelection;
-
-- (BOOL)findAsMacro;
-- (void)setFindAsMacro:(BOOL)newFindAsMacro;
-
-- (BOOL)replaceAsMacro;
-- (void)setReplaceAsMacro:(BOOL)newReplaceAsMacro;
-
-- (BOOL)shouldSetWhenEmpty;
-- (void)setShouldSetWhenEmpty:(BOOL)newShouldSetWhenEmpty;
-
-- (NSString *)replaceAllTooltip;
-- (void)setReplaceAllTooltip:(NSString *)newReplaceAllTooltip;
-
-- (NSString *)replaceLabel;
-- (void)setReplaceLabel:(NSString *)newReplaceLabel;
-
- (BOOL)validateField:(id *)value error:(NSError **)error;
- (BOOL)validateFindString:(id *)value error:(NSError **)error;
- (BOOL)validateReplaceString:(id *)value error:(NSError **)error;
Modified: trunk/bibdesk/BDSKFindController.m
===================================================================
--- trunk/bibdesk/BDSKFindController.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKFindController.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -69,6 +69,9 @@
@implementation BDSKFindController
+@synthesize operation, findString, searchType, searchScope, ignoreCase,
wrapAround, searchSelection, findAsMacro, replaceAsMacro, shouldSetWhenEmpty,
replaceAllTooltip, replaceLabel;
+@dynamic field, replaceString;
+
+ (BDSKFindController *)sharedFindController{
if(sharedFC == nil)
sharedFC = [[BDSKFindController alloc] init];
@@ -236,10 +239,6 @@
#pragma mark Accessors
-- (BDSKSearchOperation)operation {
- return operation;
-}
-
- (void)setOperation:(BDSKSearchOperation)newOperation {
if (operation != newOperation) {
operation = newOperation;
@@ -297,50 +296,6 @@
}
}
-- (BDSKSearchType)searchType {
- return searchType;
-}
-
-- (void)setSearchType:(BDSKSearchType)newSearchType {
- if (searchType != newSearchType) {
- searchType = newSearchType;
- }
-}
-
-- (BDSKSearchScope)searchScope {
- return searchScope;
-}
-
-- (void)setSearchScope:(BDSKSearchScope)newSearchScope {
- if (searchScope != newSearchScope) {
- searchScope = newSearchScope;
- }
-}
-
-- (BOOL)ignoreCase {
- return ignoreCase;
-}
-
-- (void)setIgnoreCase:(BOOL)newIgnoreCase {
- if (ignoreCase != newIgnoreCase) {
- ignoreCase = newIgnoreCase;
- }
-}
-
-- (BOOL)wrapAround {
- return wrapAround;
-}
-
-- (void)setWrapAround:(BOOL)newWrapAround {
- if (wrapAround != newWrapAround) {
- wrapAround = newWrapAround;
- }
-}
-
-- (BOOL)searchSelection {
- return searchSelection;
-}
-
- (void)setSearchSelection:(BOOL)newSearchSelection {
if (searchSelection != newSearchSelection) {
searchSelection = newSearchSelection;
@@ -348,10 +303,6 @@
}
}
-- (BOOL)findAsMacro {
- return findAsMacro;
-}
-
- (void)setFindAsMacro:(BOOL)newFindAsMacro {
if (findAsMacro != newFindAsMacro) {
findAsMacro = newFindAsMacro;
@@ -359,10 +310,6 @@
}
}
-- (BOOL)replaceAsMacro {
- return replaceAsMacro;
-}
-
- (void)setReplaceAsMacro:(BOOL)newReplaceAsMacro {
if (replaceAsMacro != newReplaceAsMacro) {
replaceAsMacro = newReplaceAsMacro;
@@ -370,38 +317,6 @@
}
}
-- (BOOL)shouldSetWhenEmpty {
- return shouldSetWhenEmpty;
-}
-
-- (void)setShouldSetWhenEmpty:(BOOL)newShouldSetWhenEmpty {
- if (shouldSetWhenEmpty != newShouldSetWhenEmpty) {
- shouldSetWhenEmpty = newShouldSetWhenEmpty;
- }
-}
-
-- (NSString *)replaceAllTooltip {
- return [[replaceAllTooltip retain] autorelease];
-}
-
-- (void)setReplaceAllTooltip:(NSString *)newReplaceAllTooltip {
- if (replaceAllTooltip != newReplaceAllTooltip) {
- [replaceAllTooltip release];
- replaceAllTooltip = [newReplaceAllTooltip copy];
- }
-}
-
-- (NSString *)replaceLabel {
- return [[replaceLabel retain] autorelease];
-}
-
-- (void)setReplaceLabel:(NSString *)newReplaceLabel {
- if (replaceLabel != newReplaceLabel) {
- [replaceLabel release];
- replaceLabel = [newReplaceLabel copy];
- }
-}
-
#pragma mark Array accessors
- (NSArray *)findHistory {
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -57,7 +57,7 @@
- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
-- (BDSKMacroResolver *)macroResolver;
+@property (nonatomic, readonly) BDSKMacroResolver *macroResolver;
- (NSArray *)macros;
- (void)setMacros:(NSArray *)newMacros;
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -65,6 +65,8 @@
@implementation BDSKMacroWindowController
+@synthesize macroResolver;
+
- (id)init {
self = [self initWithMacroResolver:nil];
return self;
@@ -201,10 +203,6 @@
#pragma mark Accessors
-- (BDSKMacroResolver *)macroResolver{
- return macroResolver;
-}
-
- (NSArray *)macros {
return macros;
}
Modified: trunk/bibdesk/BDSKNotesWindowController.h
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKNotesWindowController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -57,10 +57,8 @@
- (id)initWithURL:(NSURL *)aURL;
-- (NSArray *)tags;
-- (void)setTags:(NSArray *)newTags;
-- (double)rating;
-- (void)setRating:(double)newRating;
+@property (nonatomic, copy) NSArray *tags;
+@property (nonatomic) double rating;
- (IBAction)refresh:(id)sender;
- (IBAction)openInSkim:(id)sender;
Modified: trunk/bibdesk/BDSKNotesWindowController.m
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKNotesWindowController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -53,6 +53,8 @@
@implementation BDSKNotesWindowController
+@synthesize tags, rating;
+
- (id)initWithURL:(NSURL *)aURL {
self = [super init];
if (self) {
@@ -136,25 +138,6 @@
[notes sortUsingDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor
alloc] initWithKey:@"page" ascending:YES] autorelease]]];
}
-- (NSArray *)tags {
- return tags;
-}
-
-- (void)setTags:(NSArray *)newTags {
- if (tags != newTags) {
- [tags release];
- tags = [newTags retain];
- }
-}
-
-- (double)rating {
- return rating;
-}
-
-- (void)setRating:(double)newRating {
- rating = newRating;
-}
-
#pragma mark Actions
- (IBAction)refresh:(id)sender {
Modified: trunk/bibdesk/BDSKOpenAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKOpenAccessoryViewController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKOpenAccessoryViewController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -49,13 +49,10 @@
IBOutlet NSTextField *filterLabelField;
}
-- (NSView *)openTextEncodingAccessoryView;
-- (NSView *)openUsingFilterAccessoryView;
+@property (nonatomic, readonly) NSView *openTextEncodingAccessoryView;
+@property (nonatomic, readonly) NSView *openUsingFilterAccessoryView;
-- (NSStringEncoding)encoding;
-- (void)setEncoding:(NSStringEncoding)encoding;
+@property (nonatomic) NSStringEncoding encoding;
+@property (nonatomic, retain) NSString *filterCommand;
-- (NSString *)filterCommand;
-- (void)setFilterCommand:(NSString *)command;
-
@end
Modified: trunk/bibdesk/BDSKOpenAccessoryViewController.m
===================================================================
--- trunk/bibdesk/BDSKOpenAccessoryViewController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKOpenAccessoryViewController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -46,6 +46,8 @@
@implementation BDSKOpenAccessoryViewController
+@dynamic openUsingFilterAccessoryView, openTextEncodingAccessoryView,
encoding, filterCommand;
+
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
self = [super initWithNibName:@"BDSKOpenAccessoryView" bundle:nil];
if (self) {
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.h
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -81,9 +81,8 @@
- (void)insertObject:(id)obj inOrphanedFilesAtIndex:(NSUInteger)theIndex;
- (void)removeObjectFromOrphanedFilesAtIndex:(NSUInteger)theIndex;
-- (NSString *)searchString;
-- (void)setSearchString:(NSString *)newSearchString;
+@property (nonatomic, retain) NSString *searchString;
-- (BOOL)wasLaunched;
+@property (nonatomic, readonly) BOOL wasLaunched;
@end
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -77,6 +77,8 @@
@implementation BDSKOrphanedFilesFinder
+@synthesize searchString, wasLaunched;
+
static BDSKOrphanedFilesFinder *sharedFinder = nil;
+ (id)sharedFinder {
@@ -265,20 +267,6 @@
[orphanedFiles removeObjectAtIndex:theIndex];
}
-- (NSString *)searchString {
- return searchString;
-}
-
-- (void)setSearchString:(NSString *)aString;
-{
- [searchString autorelease];
- searchString = [aString copy];
-}
-
-- (BOOL)wasLaunched {
- return wasLaunched;
-}
-
#pragma mark TableView stuff
// dummy dataSource implementation
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKPersonController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -70,16 +70,12 @@
- (id)initWithPerson:(BibAuthor *)aPerson;
#pragma mark accessors
-- (BibAuthor *)person;
-- (void)setPerson:(BibAuthor *)newPerson;
-- (NSArray *)publicationItems;
-- (void)setPublicationItems:(NSArray *)items;
-- (NSSet *)names;
-- (void)setNames:(NSSet *)newNames;
-- (NSSet *)fields;
-- (void)setFields:(NSSet *)newFields;
-- (NSImage *)image;
-- (id<BDSKOwner>)personOwner;
+@property (nonatomic, retain) BibAuthor *person;
+@property (nonatomic, copy) NSArray *publicationItems;
+@property (nonatomic, copy) NSSet *names;
+@property (nonatomic, copy) NSSet *fields;
+@property (nonatomic, readonly) NSImage *image;
+@property (nonatomic, readonly) id<BDSKOwner> personOwner;
#pragma mark actions
- (IBAction)edit:(id)sender;
@@ -93,6 +89,6 @@
- (void)openSelectedPub:(id)sender;
- (void)changeNameToString:(NSString *)newNameString;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKPersonController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -57,6 +57,9 @@
@implementation BDSKPersonController
+@synthesize person, names, fields, personOwner=owner;
+@dynamic publicationItems, image;
+
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([key isEqualToString:@"image"])
@@ -265,32 +268,6 @@
}
}
-- (NSSet *)names {
- return names;
-}
-
-- (void)setNames:(NSSet *)newNames {
- if (names != newNames) {
- [names release];
- names = [newNames copy];
- }
-}
-
-- (NSSet *)fields {
- return fields;
-}
-
-- (void)setFields:(NSSet *)newFields {
- if (fields != newFields) {
- [fields release];
- fields = [newFields copy];
- }
-}
-
-- (BibAuthor *)person {
- return person;
-}
-
- (void)setPerson:(BibAuthor *)newPerson {
if(newPerson != person){
if (nil != person) {
@@ -310,10 +287,6 @@
return image ?: [[NSWorkspace sharedWorkspace] iconForFileType:@"vcf"];
}
-- (id<BDSKOwner>)personOwner{
- return owner;
-}
-
#pragma mark actions
- (void)editSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
Modified: trunk/bibdesk/BDSKPreferenceController.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKPreferenceController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -76,14 +76,14 @@
- (IBAction)search:(id)sender;
- (IBAction)changeFont:(id)sender;
-- (NSArray *)categories;
+@property (nonatomic, readonly) NSArray *categories;
- (NSArray *)panesForCategory:(NSString *)category;
-- (NSArray *)allPaneIdentifiers;
+@property (nonatomic, readonly) NSArray *allPaneIdentifiers;
- (id)paneForIdentifier:(NSString *)identifier;
-- (NSString *)selectedPaneIdentifier;
-- (id)selectedPane;
+@property (nonatomic, readonly) NSString *selectedPaneIdentifier;
+@property (nonatomic, readonly) id selectedPane;
- (void)selectPaneWithIdentifier:(NSString *)identifier;
Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKPreferenceController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -88,6 +88,9 @@
@implementation BDSKPreferenceController
+@synthesize categories, selectedPaneIdentifier;
+@dynamic allPaneIdentifiers, selectedPane;
+
// we want to be able to get the shared instance in MainMenu.nib, which passes
through alloc/init, so we need to be a bit more careful
static id sharedController = nil;
@@ -312,10 +315,6 @@
#pragma mark Categories and Panes
-- (NSArray *)categories {
- return categories;
-}
-
- (NSArray *)panesForCategory:(NSString *)category {
return [[categoryDicts objectForKey:category] valueForKey:PANES_KEY];
}
@@ -331,10 +330,6 @@
return [panes objectForKey:identifier];
}
-- (NSString *)selectedPaneIdentifier {
- return selectedPaneIdentifier;
-}
-
- (void)setSelectedPaneIdentifier:(NSString *)identifier {
if (identifier != selectedPaneIdentifier) {
[selectedPaneIdentifier release];
Modified: trunk/bibdesk/BDSKPreferencePane.h
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKPreferencePane.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -49,20 +49,19 @@
- (id)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController;
-- (BDSKPreferenceController *)preferenceController;
+@property (nonatomic, readonly) BDSKPreferenceController *preferenceController;
-- (BDSKPreferenceRecord *)record;
+@property (nonatomic, readonly) BDSKPreferenceRecord *record;
-- (NSString *)identifier;
-- (NSString *)title;
-- (NSString *)label;
-- (NSString *)toolTip;
-- (NSImage *)icon;
-- (NSString *)helpAnchor;
-- (NSURL *)helpURL;
-- (NSDictionary *)initialValues;
+@property (nonatomic, readonly) NSString *identifier;
+@property (nonatomic, readonly) NSString *label;
+@property (nonatomic, readonly) NSString *toolTip;
+@property (nonatomic, readonly) NSImage *icon;
+@property (nonatomic, readonly) NSString *helpAnchor;
+@property (nonatomic, readonly) NSURL *helpURL;
+@property (nonatomic, readonly) NSDictionary *initialValues;
-- (BOOL)isViewLoaded;
+@property (nonatomic, readonly) BOOL isViewLoaded;
// these are sent to the relevant pane(s), usually the selected pane, and by
default do nothing
Modified: trunk/bibdesk/BDSKPreferencePane.m
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKPreferencePane.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -43,6 +43,8 @@
@implementation BDSKPreferencePane
+@dynamic preferenceController, record, identifier, label, toolTip, icon,
helpAnchor, helpURL, initialValues, isViewLoaded;
+
- (id)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController {
self = [super initWithNibName:[aRecord nibName] ?: [self nibName]
bundle:nil];
if (self) {
Modified: trunk/bibdesk/BDSKPreviewer.h
===================================================================
--- trunk/bibdesk/BDSKPreviewer.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKPreviewer.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -75,16 +75,16 @@
*/
+ (BDSKPreviewer *)sharedPreviewer;
-- (PDFView *)pdfView;
-- (NSView *)pdfContentView;
-- (BDSKOverlayPanel *)progressOverlay;
+@property (nonatomic, readonly) PDFView *pdfView;
+@property (nonatomic, readonly) NSView *pdfContentView;
+@property (nonatomic, readonly) BDSKOverlayPanel *progressOverlay;
-- (CGFloat)PDFScaleFactor;
-- (void)setPDFScaleFactor:(CGFloat)scaleFactor;
+@property (nonatomic) CGFloat PDFScaleFactor;
- (void)terminate;
-- (BOOL)isVisible;
+@property (nonatomic, readonly) BOOL isVisible;
+
- (void)handleMainDocumentDidChangeNotification:(NSNotification *)notification;
- (void)shouldShowTeXPreferences:(NSWindow *)sheet
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKPreviewer.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -76,6 +76,8 @@
@implementation BDSKPreviewer
+@dynamic pdfView, pdfContentView, progressOverlay, PDFScaleFactor, isVisible;
+
static BDSKPreviewer *sharedPreviewer = nil;
+ (BDSKPreviewer *)sharedPreviewer{
Modified: trunk/bibdesk/BDSKSaveAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -47,21 +47,14 @@
IBOutlet NSTextField *encodingLabelField;
}
-- (NSView *)saveAccessoryView;
-- (NSView *)exportAccessoryView;
+@property (nonatomic, readonly) NSView *saveAccessoryView;
+@property (nonatomic, readonly) NSView *exportAccessoryView;
- (void)addSaveFormatPopUpButton:(NSPopUpButton *)popup;
-- (NSStringEncoding)saveTextEncoding;
-- (void)setSaveTextEncoding:(NSStringEncoding)encoding;
+@property (nonatomic) NSStringEncoding saveTextEncoding;
+@property (nonatomic) BOOL exportSelection;
+@property (nonatomic, getter=isSaveTextEncodingPopupButtonEnabled) BOOL
saveTextEncodingPopupButtonEnabled;
+@property (nonatomic, getter=isExportSelectionCheckButtonEnabled) BOOL
exportSelectionCheckButtonEnabled;
-- (BOOL)exportSelection;
-- (void)setExportSelection:(BOOL)flag;
-
-- (BOOL)isSaveTextEncodingPopupButtonEnabled;
-- (void)setSaveTextEncodingPopupButtonEnabled:(BOOL)flag;
-
-- (BOOL)isExportSelectionCheckButtonEnabled;
-- (void)setExportSelectionCheckButtonEnabled:(BOOL)flag;
-
@end
Modified: trunk/bibdesk/BDSKSaveAccessoryViewController.m
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -42,6 +42,8 @@
@implementation BDSKSaveAccessoryViewController
+@dynamic saveAccessoryView, exportAccessoryView, saveTextEncoding,
exportSelection,saveTextEncodingPopupButtonEnabled,
exportSelectionCheckButtonEnabled;
+
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
self = [super initWithNibName:@"BDSKSaveAccessoryView" bundle:nil];
if (self) {
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -55,16 +55,13 @@
- (id)initWithPath:(NSString *)aPath arguments:(NSString *)anArguments;
-- (NSString *)path;
-- (void)setPath:(NSString *)newPath;
+@property (nonatomic, retain) NSString *path;
+@property (nonatomic, retain) NSString *arguments;
-- (NSString *)arguments;
-- (void)setArguments:(NSString *)newArguments;
-
- (IBAction)chooseScriptPath:(id)sender;
- (BOOL)commitEditing;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -49,6 +49,9 @@
@implementation BDSKScriptGroupSheetController
+@synthesize path, arguments;
+@dynamic undoManager;
+
- (id)init {
self = [self initWithPath:nil arguments:nil];
return self;
@@ -141,10 +144,6 @@
}];
}
-- (NSString *)path{
- return path;
-}
-
- (void)setPath:(NSString *)newPath{
if(path != newPath){
[(BDSKScriptGroupSheetController *)[[self undoManager]
prepareWithInvocationTarget:self] setPath:path];
@@ -153,10 +152,6 @@
}
}
-- (NSString *)arguments{
- return arguments;
-}
-
- (void)setArguments:(NSString *)newArguments{
if(arguments != newArguments){
[(BDSKScriptGroupSheetController *)[[self undoManager]
prepareWithInvocationTarget:self] setArguments:arguments];
Modified: trunk/bibdesk/BDSKSearchBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchBookmarkController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -61,6 +61,6 @@
- (void)saveBookmarks;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -78,6 +78,8 @@
@implementation BDSKSearchBookmarkController
+@dynamic undoManager;
+
static BDSKSearchBookmarkController *sharedBookmarkController = nil;
+ (id)sharedBookmarkController {
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -86,26 +86,22 @@
- (IBAction)toggle:(id)sender;
-- (void)setCustom:(BOOL)flag;
-- (BOOL)isCustom;
-- (void)setEditable:(BOOL)flag;
-- (BOOL)isEditable;
-- (BOOL)isZoom;
-- (BOOL)isISI;
-- (BOOL)isZoomOrISI;
+@property (nonatomic, getter=isCustom) BOOL custom;
+@property (nonatomic, getter=isEditable) BOOL editable;
+@property (nonatomic, readonly, getter=isZoom) BOOL zoom;
+@property (nonatomic, readonly, getter=isISI) BOOL ISI;
+@property (nonatomic, readonly, getter=isZoomOrISI) BOOL zoomOrISI;
-- (void)setType:(NSString *)newType;
-- (NSString *)type;
+@property (nonatomic, retain) NSString *type;
-- (void)setTypeTag:(NSInteger)tag;
-- (NSInteger)typeTag;
+@property (nonatomic) NSInteger typeTag;
-- (void)setServerInfo:(BDSKServerInfo *)info;
-- (BDSKServerInfo *)serverInfo;
+@property (nonatomic, copy) BDSKServerInfo *serverInfo;
- (IBAction)selectPredefinedServer:(id)sender;
- (BOOL)commitEditing;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
+
@end
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -53,6 +53,9 @@
@implementation BDSKSearchGroupSheetController
+@synthesize custom, editable;
+@dynamic zoom, ISI, zoomOrISI, typeTag, serverInfo, undoManager;
+
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([[NSSet setWithObjects:@"type", nil] containsObject:key])
@@ -330,20 +333,6 @@
#pragma mark Accessors
-- (void)setCustom:(BOOL)flag;
-{
- isCustom = flag;
-}
-
-- (BOOL)isCustom { return isCustom; }
-
-- (void)setEditable:(BOOL)flag;
-{
- isEditable = flag;
-}
-
-- (BOOL)isEditable { return isEditable; }
-
- (BOOL)isZoom { return [serverInfo isZoom]; }
- (BOOL)isISI { return [serverInfo isISI]; }
Modified: trunk/bibdesk/BDSKSearchGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchGroupViewController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -46,8 +46,7 @@
IBOutlet NSButton *searchButton;
}
-- (BDSKSearchGroup *)group;
-- (void)setGroup:(BDSKSearchGroup *)newGroup;
+@property (nonatomic, retain) BDSKSearchGroup *group;
- (IBAction)changeSearchTerm:(id)sender;
- (IBAction)nextSearch:(id)sender;
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -44,6 +44,8 @@
@implementation BDSKSearchGroupViewController
+@dynamic group;
+
- (id)init {
return [super initWithNibName:@"BDSKSearchGroupView" bundle:nil];
}
Modified: trunk/bibdesk/BDSKTemplateDocument.h
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKTemplateDocument.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -114,49 +114,32 @@
NSAttributedString *attributedString;
}
-- (NSArray *)typeTemplates;
+@property (nonatomic, readonly) NSArray *typeTemplates;
-- (NSArray *)specialTokens;
-- (void)setSpecialTokens:(NSArray *)newSpecialTokens;
+@property (nonatomic, copy) NSArray *specialTokens;
+@property (nonatomic, copy) NSArray *defaultTokens;
-- (NSArray *)defaultTokens;
-- (void)setDefaultTokens:(NSArray *)newDefaultTokens;
+@property (nonatomic, retain) NSAttributedString *prefixTemplate;
+@property (nonatomic, retain) NSAttributedString *suffixTemplate;
+@property (nonatomic, retain) NSAttributedString *separatorTemplate;
-- (NSAttributedString *)prefixTemplate;
-- (void)setPrefixTemplate:(NSAttributedString *)newPrefixTemplate;
+@property (nonatomic, getter=isRichText) BOOL richText;
-- (NSAttributedString *)suffixTemplate;
-- (void)setSuffixTemplate:(NSAttributedString *)newSuffixTemplate;
+@property (nonatomic, retain) NSString *fontName;
+@property (nonatomic) CGFloat fontSize;
-- (NSAttributedString *)separatorTemplate;
-- (void)setSeparatorTemplate:(NSAttributedString *)newSeparatorTemplate;
+@property (nonatomic, getter=isBold) BOOL bold;
+@property (nonatomic, getter=isItalic) BOOL italic;
-- (BOOL)isRichText;
-- (void)setRichText:(BOOL)newRichText;
+@property (nonatomic, retain) BDSKToken *selectedToken;
-- (NSString *)fontName;
-- (void)setFontName:(NSString *)newFontName;
+@property (nonatomic) NSUInteger defaultTypeIndex;
-- (CGFloat)fontSize;
-- (void)setFontSize:(CGFloat)newFontSize;
+@property (nonatomic, readonly) NSAttributedString *attributedString;
+@property (nonatomic, readonly) NSString *string;
-- (BOOL)isBold;
-- (void)setBold:(BOOL)newBold;
+@property (nonatomic, readonly) NSAttributedString *previewAttributedString;
-- (BOOL)isItalic;
-- (void)setItalic:(BOOL)newItalic;
-
-- (BDSKToken *)selectedToken;
-- (void)setSelectedToken:(BDSKToken *)newSelectedToken;
-
-- (NSUInteger)defaultTypeIndex;
-- (void)setDefaultTypeIndex:(NSUInteger)newDefaultTypeIndex;
-
-- (NSAttributedString *)attributedString;
-- (NSString *)string;
-
-- (NSAttributedString *)previewAttributedString;
-
- (IBAction)addField:(id)sender;
- (void)startObservingTypeTemplate:(BDSKTypeTemplate *)typeTemplate;
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -95,6 +95,9 @@
@implementation BDSKTemplateDocument
+@synthesize typeTemplates, specialTokens, defaultTokens, prefixTemplate,
suffixTemplate, separatorTemplate, richText, fontName, fontSize, bold, italic,
selectedToken, defaultTypeIndex;
+@dynamic attributedString, string, previewAttributedString;
+
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([key isEqualToString:@"previewAttributedString"])
@@ -457,10 +460,6 @@
#pragma mark Accessors
-- (NSArray *)typeTemplates {
- return typeTemplates;
-}
-
- (NSUInteger)countOfSizes {
return sizeof(BDSKDefaultFontSizes) / sizeof(CGFloat);
}
@@ -477,53 +476,29 @@
return [NSNumber numberWithDouble:idx == 0 ? 0.0 :
BDSKDefaultFontSizes[idx - 1]];
}
-- (NSArray *)specialTokens {
- return specialTokens;
-}
-
- (void)setSpecialTokens:(NSArray *)newSpecialTokens {
[specialTokens setArray:newSpecialTokens];
}
-- (NSArray *)defaultTokens {
- return defaultTokens;
-}
-
- (void)setDefaultTokens:(NSArray *)newDefaultTokens {
[defaultTokens setArray:newDefaultTokens];
}
-- (NSAttributedString *)prefixTemplate {
- return prefixTemplate;
-}
-
- (void)setPrefixTemplate:(NSAttributedString *)newPrefixTemplate {
[[[self undoManager] prepareWithInvocationTarget:self]
setPrefixTemplate:[[prefixTemplate copy] autorelease]];
[prefixTemplate setAttributedString:newPrefixTemplate ?:
[[[NSAttributedString alloc] init] autorelease]];
}
-- (NSAttributedString *)suffixTemplate {
- return suffixTemplate;
-}
-
- (void)setSuffixTemplate:(NSAttributedString *)newSuffixTemplate {
[[[self undoManager] prepareWithInvocationTarget:self]
setSuffixTemplate:[[suffixTemplate copy] autorelease]];
[suffixTemplate setAttributedString:newSuffixTemplate ?:
[[[NSAttributedString alloc] init] autorelease]];
}
-- (NSAttributedString *)separatorTemplate {
- return separatorTemplate;
-}
-
- (void)setSeparatorTemplate:(NSAttributedString *)newSeparatorTemplate {
[[[self undoManager] prepareWithInvocationTarget:self]
setSeparatorTemplate:[[separatorTemplate copy] autorelease]];
[separatorTemplate setAttributedString:newSeparatorTemplate ?:
[[[NSAttributedString alloc] init] autorelease]];
}
-- (BOOL)isRichText {
- return richText;
-}
-
- (void)setRichText:(BOOL)newRichText {
if (richText != newRichText) {
[[[self undoManager] prepareWithInvocationTarget:self]
setRichText:richText];
@@ -537,10 +512,6 @@
}
}
-- (NSString *)fontName {
- return fontName;
-}
-
- (void)setFontName:(NSString *)newFontName {
if (fontName != newFontName) {
[[[self undoManager] prepareWithInvocationTarget:self]
setFontName:fontName];
@@ -551,10 +522,6 @@
}
}
-- (CGFloat)fontSize {
- return fontSize;
-}
-
- (void)setFontSize:(CGFloat)newFontSize {
if (fabs(fontSize - newFontSize) > 0.0) {
[[[self undoManager] prepareWithInvocationTarget:self]
setFontSize:fontSize];
@@ -564,10 +531,6 @@
}
}
-- (BOOL)isBold {
- return bold;
-}
-
- (void)setBold:(BOOL)newBold {
if (bold != newBold) {
[(BDSKTemplateDocument *)[[self undoManager]
prepareWithInvocationTarget:self] setBold:bold];
@@ -577,10 +540,6 @@
}
}
-- (BOOL)isItalic {
- return italic;
-}
-
- (void)setItalic:(BOOL)newItalic {
if (italic != newItalic) {
[(BDSKTemplateDocument *)[[self undoManager]
prepareWithInvocationTarget:self] setItalic:italic];
@@ -590,10 +549,6 @@
}
}
-- (BDSKToken *)selectedToken {
- return selectedToken;
-}
-
- (void)setSelectedToken:(BDSKToken *)newSelectedToken {
if (selectedToken != newSelectedToken) {
[selectedToken release];
@@ -602,10 +557,6 @@
}
}
-- (NSUInteger)defaultTypeIndex {
- return defaultTypeIndex;
-}
-
- (void)setDefaultTypeIndex:(NSUInteger)newDefaultTypeIndex {
if (defaultTypeIndex != newDefaultTypeIndex) {
[[[self undoManager] prepareWithInvocationTarget:self]
setDefaultTypeIndex:defaultTypeIndex];
Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKTextImportController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -102,8 +102,8 @@
- (id)initForOwner:(id <BDSKOwner>)anOwner;
-- (BibItem *)publication;
-- (NSArray *)addedPublications;
+@property (nonatomic, readonly) BibItem *publication;
+@property (nonatomic, readonly) NSArray *addedPublications;
- (void)beginSheetForURL:(NSURL *)aURL modalForWindow:(NSWindow *)aWindow
completionHandler:(void (^)(NSInteger result))handler;
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKTextImportController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -110,6 +110,9 @@
@implementation BDSKTextImportController
+@synthesize addedPublications=itemsAdded;
+@dynamic publication;
+
- (id)initForOwner:(id <BDSKOwner>)anOwner {
self = [super initWithWindowNibName:[self windowNibName]];
if(self){
@@ -207,10 +210,6 @@
return [publications lastObject];
}
-- (NSArray *)addedPublications {
- return itemsAdded;
-}
-
#pragma mark Calling the main sheet
- (void)beginSheetForURL:(NSURL *)aURL modalForWindow:(NSWindow *)aWindow
completionHandler:(void (^)(NSInteger result))handler {
Modified: trunk/bibdesk/BDSKTextViewCompletionController.h
===================================================================
--- trunk/bibdesk/BDSKTextViewCompletionController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKTextViewCompletionController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -52,7 +52,8 @@
+ (id)sharedController;
-- (NSTextView *)currentTextView;
+@property (nonatomic, readonly) NSTextView *currentTextView;
+
- (void)displayCompletions:(NSArray *)completions
indexOfSelectedItem:(NSInteger)indexOfSelectedItem
forPartialWordRange:(NSRange)partialWordRange originalString:(NSString
*)originalString forTextView:(NSTextView *)textView;
- (void)endDisplay;
- (void)endDisplayAndComplete:(BOOL)complete;
Modified: trunk/bibdesk/BDSKTextViewCompletionController.m
===================================================================
--- trunk/bibdesk/BDSKTextViewCompletionController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKTextViewCompletionController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -44,7 +44,7 @@
static id sharedController = nil;
-@interface BDSKTextViewCompletionController (Private)
+@interface BDSKTextViewCompletionController ()
+ (NSWindow *)completionWindow;
- (void)setupTable;
@@ -60,10 +60,19 @@
- (void)setTextViewWindow:(NSWindow *)aWindow;
- (void)setCompletions:(NSArray *)newCompletions;
+// retain the text view, just in case; we've seen some unreproducible crashes
in objc_msgSend_stret when calling updateCompletionsAndInsert:, which is
presumably the call to rangeForUserCompletion or windowLocation
+@property (nonatomic, retain) NSTextView *currentTextView;
+@property (nonatomic, copy) NSString *originalString;
+// do not retain!
+@property (nonatomic, assign) NSWindow *textViewWindow;
+@property (nonatomic, copy) NSArray *completions;
+
@end
@implementation BDSKTextViewCompletionController
+@synthesize currentTextView=textView, originalString, textViewWindow,
completions;
+
+ (id)sharedController;
{
if(sharedController == nil)
@@ -94,8 +103,6 @@
[super dealloc];
}
-- (NSTextView *)currentTextView { return textView; }
-
- (void)tableViewSelectionDidChange:(NSNotification *)notification;
{
NSInteger row = [tableView selectedRow];
@@ -248,10 +255,8 @@
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tv { return [completions
count]; }
-@end
+#pragma mark Private
-@implementation BDSKTextViewCompletionController (Private)
-
// constants for determining the window height, which we adjust based on
parent window location and screen size
#define BDSKCompletionMaxWidth 350.0
#define BDSKCompletionMaxHeight 200.0
@@ -453,37 +458,6 @@
- (void)handleWindowChangedNotification:(NSNotification *)notification { [self
endDisplayAndComplete:NO]; }
-// retain the text view, just in case; we've seen some unreproducible crashes
in objc_msgSend_stret when calling updateCompletionsAndInsert:, which is
presumably the call to rangeForUserCompletion or windowLocation
-- (void)setCurrentTextView:(NSTextView *)tv;
-{
- if(tv != textView){
- [textView release];
- textView = [tv retain];
- }
-}
-
-- (void)setOriginalString:(NSString *)string;
-{
- if(string != originalString){
- [originalString release];
- originalString = [string copy];
- }
-}
-
-// do not retain!
-- (void)setTextViewWindow:(NSWindow *)aWindow;
-{
- textViewWindow = aWindow;
-}
-
-- (void)setCompletions:(NSArray *)newCompletions;
-{
- if(completions != newCompletions){
- [completions release];
- completions = [newCompletions copy];
- }
-}
-
@end
#pragma mark NSWindow subclass
Modified: trunk/bibdesk/BDSKTypeInfoEditor.h
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.h 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKTypeInfoEditor.h 2019-07-15 17:50:47 UTC (rev 24029)
@@ -67,8 +67,9 @@
- (void)addType:(NSString *)newType withFields:(NSDictionary *)fieldsDict;
- (void)insertType:(NSString *)newType withFields:(NSDictionary *)fieldsDict
atIndex:(NSUInteger)index;
-- (void)setCurrentType:(NSString *)newCurrentType;
+@property (nonatomic, retain) NSString *currentType;
+
- (IBAction)addRemoveType:(id)sender;
- (IBAction)addRemoveRequired:(id)sender;
- (IBAction)addRemoveOptional:(id)sender;
Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m 2019-07-15 15:28:46 UTC (rev 24028)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m 2019-07-15 17:50:47 UTC (rev 24029)
@@ -55,6 +55,8 @@
@implementation BDSKTypeInfoEditor
+@synthesize currentType;
+
+ (BDSKTypeInfoEditor *)sharedTypeInfoEditor{
if (sharedTypeInfoEditor == nil)
sharedTypeInfoEditor = [[BDSKTypeInfoEditor alloc] init];
Modified: trunk/bibdesk/BDSKURLGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKURLGroupSheetController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -57,13 +57,12 @@
- (IBAction)chooseURL:(id)sender;
-- (NSString *)urlString;
-- (void)setUrlString:(NSString *)newUrlString;
+@property (nonatomic, retain) NSString *urlString;
-- (NSURL *)URL;
+@property (nonatomic, readonly) NSURL *URL;
- (BOOL)commitEditing;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -51,6 +51,9 @@
@implementation BDSKURLGroupSheetController
+@synthesize urlString;
+@dynamic URL, undoManager;
+
- (id)init {
self = [self initWithURL:nil];
return self;
@@ -107,10 +110,6 @@
}];
}
-- (NSString *)urlString {
- return [[urlString retain] autorelease];
-}
-
- (void)setUrlString:(NSString *)newUrlString {
if (urlString != newUrlString) {
[[[self undoManager] prepareWithInvocationTarget:self]
setUrlString:urlString];
Modified: trunk/bibdesk/BDSKURLSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKURLSheetController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -45,10 +45,9 @@
IBOutlet NSButton *cancelButton;
}
-- (NSString *)urlString;
-- (void)setUrlString:(NSString *)newUrlString;
+@property (nonatomic, retain) NSString *urlString;
-- (NSURL *)URL;
+@property (nonatomic, readonly) NSURL *URL;
- (void)openBookmark:(id)sender;
Modified: trunk/bibdesk/BDSKURLSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKURLSheetController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -46,6 +46,8 @@
@implementation BDSKURLSheetController
+@dynamic urlString, URL;
+
- (NSString *)windowNibName {
return @"BDSKURLSheet";
}
Modified: trunk/bibdesk/BDSKWebGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.h 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKWebGroupViewController.h 2019-07-15 17:50:47 UTC (rev
24029)
@@ -49,8 +49,7 @@
BDSKFieldEditor *fieldEditor;
}
-- (BDSKWebView *)webView;
-- (void)setWebView:(BDSKWebView *)newWebView;
+@property (nonatomic, retain) BDSKWebView *webView;
- (IBAction)changeURL:(id)sender;
- (IBAction)goBackForward:(id)sender;
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2019-07-15 15:28:46 UTC (rev
24028)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2019-07-15 17:50:47 UTC (rev
24029)
@@ -59,6 +59,8 @@
@implementation BDSKWebGroupViewController
+@dynamic webView;
+
- (id)init {
self = [super initWithNibName:@"BDSKWebGroupView" bundle:nil];
return self;
Modified: trunk/bibdesk/BDSKWebViewModalDialogController.h
===================================================================
--- trunk/bibdesk/BDSKWebViewModalDialogController.h 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKWebViewModalDialogController.h 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -45,5 +45,5 @@
BDSKWebView *webView;
BDSKStatusBar *statusBar;
}
-- (BDSKWebView *)webView;
+@property (nonatomic, readonly) BDSKWebView *webView;
@end
Modified: trunk/bibdesk/BDSKWebViewModalDialogController.m
===================================================================
--- trunk/bibdesk/BDSKWebViewModalDialogController.m 2019-07-15 15:28:46 UTC
(rev 24028)
+++ trunk/bibdesk/BDSKWebViewModalDialogController.m 2019-07-15 17:50:47 UTC
(rev 24029)
@@ -43,6 +43,8 @@
@implementation BDSKWebViewModalDialogController
+@synthesize webView;
+
- (id)init {
NSUInteger mask = NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask;
NSWindow *window = [[[NSWindow alloc] initWithContentRect:NSMakeRect(0.0,
0.0, 200.0, 200.0) styleMask:mask backing:NSBackingStoreBuffered defer:YES]
autorelease];
@@ -70,10 +72,6 @@
[[self window] setTabbingMode:NSWindowTabbingModeDisallowed];
}
-- (WebView *)webView {
- return webView;
-}
-
- (void)windowWillClose:(NSNotification *)notification {
[NSApp stopModal];
[self autorelease];
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
