Revision: 24061
http://sourceforge.net/p/bibdesk/svn/24061
Author: hofman
Date: 2019-07-19 09:46:56 +0000 (Fri, 19 Jul 2019)
Log Message:
-----------
remove 'is' from boolean property names, add it in the getter
Modified Paths:
--------------
trunk/bibdesk/BDSKCondition.h
trunk/bibdesk/BDSKCondition.m
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKErrorObject.h
trunk/bibdesk/BDSKErrorObject.m
trunk/bibdesk/BDSKField.h
trunk/bibdesk/BDSKField.m
trunk/bibdesk/BDSKGroup.h
trunk/bibdesk/BDSKGroup.m
trunk/bibdesk/BDSKPreferencePane.h
trunk/bibdesk/BDSKPreferencePane.m
trunk/bibdesk/BDSKSearchGroup.h
trunk/bibdesk/BDSKServerInfo.h
trunk/bibdesk/BDSKServerInfo.m
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_UI.h
Modified: trunk/bibdesk/BDSKCondition.h
===================================================================
--- trunk/bibdesk/BDSKCondition.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKCondition.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -146,8 +146,8 @@
- (void)setDefaultComparison;
- (void)setDefaultValue;
-@property (nonatomic, readonly) BOOL isDateCondition;
-@property (nonatomic, readonly) BOOL isAttachmentCondition;
+@property (nonatomic, readonly, getter=isDateCondition) BOOL dateCondition;
+@property (nonatomic, readonly, getter=isAttachmentCondition) BOOL
attachmentCondition;
@property (nonatomic, assign) id<BDSKSmartGroup> group;
Modified: trunk/bibdesk/BDSKCondition.m
===================================================================
--- trunk/bibdesk/BDSKCondition.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKCondition.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -60,7 +60,7 @@
@implementation BDSKCondition
@synthesize stringComparison, attachmentComparison, countValue,
dateComparison, numberValue, andNumberValue, periodValue, group;
-@dynamic dictionaryValue, key, value, comparison, primitiveKey, stringValue,
dateValue, toDateValue, isDateCondition, isAttachmentCondition;
+@dynamic dictionaryValue, key, value, comparison, primitiveKey, stringValue,
dateValue, toDateValue, dateCondition, attachmentCondition;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKErrorEditor.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -55,7 +55,7 @@
NSInteger changeCount;
NSUInteger invalidSyntaxHighlightMark;
BOOL enableSyntaxHighlighting;
- BOOL isPasteDrag;
+ BOOL pasteDrag;
}
// designated initializer
@@ -79,7 +79,7 @@
@property (nonatomic, retain) NSURL *fileURL;
@property (nonatomic, readonly) NSString *displayName;
@property (nonatomic, readonly) NSData *pasteDragData;
-@property (nonatomic, readonly) BOOL isPasteDrag;
+@property (nonatomic, readonly, getter=isPasteDrag) BOOL pasteDrag;
- (void)updateDisplayName;
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKErrorEditor.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -67,7 +67,7 @@
@implementation BDSKErrorEditor
-@synthesize textView, syntaxHighlightCheckbox, reopenButton, reloadButton,
lineNumberField, manager, errors, fileURL, displayName, pasteDragData,
isPasteDrag;
+@synthesize textView, syntaxHighlightCheckbox, reopenButton, reloadButton,
lineNumberField, manager, errors, fileURL, displayName, pasteDragData,
pasteDrag;
static NSColor *quoteColor = nil;
static NSColor *delimColor = nil;
@@ -113,7 +113,7 @@
fileURL = [aFileURL retain];
displayName = [[fileURL lastPathComponent] retain];
data = [aData copy];
- isPasteDrag = NO;
+ pasteDrag = NO;
enableSyntaxHighlighting = YES;
invalidSyntaxHighlightMark = NSNotFound;
changeCount = 0;
@@ -130,7 +130,7 @@
- (id)initWithPasteDragData:(NSData *)aData;
{
if(self = [self initWithFileURL:nil pasteDragData:aData]){
- isPasteDrag = YES;
+ pasteDrag = YES;
}
return self;
}
@@ -154,7 +154,7 @@
{
[self setWindowFrameAutosaveNameOrCascade:@"Edit Source Window"];
- if(isPasteDrag)
+ if(pasteDrag)
[reopenButton setEnabled:NO];
[[textView textStorage] setDelegate:self];
@@ -176,7 +176,7 @@
[lineNumberView setRuleThickness:[lineNumberView requiredRuleThickness]];
- NSString *prefix = (isPasteDrag) ? NSLocalizedString(@"Paste/Drag Data",
@"Partial window title") : NSLocalizedString(@"Source Data", @"Partial window
title");
+ NSString *prefix = (pasteDrag) ? NSLocalizedString(@"Paste/Drag Data",
@"Partial window title") : NSLocalizedString(@"Source Data", @"Partial window
title");
BDSKASSERT(fileURL);
[[self window] setRepresentedFilename:[fileURL path]];
@@ -233,7 +233,7 @@
- (void)updateDisplayName {
[self willChangeValueForKey:@"displayName"];
NSString *newDisplayName = [manager displayName];
- if (isPasteDrag)
+ if (pasteDrag)
newDisplayName = [NSString stringWithFormat:@"[%@]", newDisplayName];
if (displayName != newDisplayName) {
[displayName release];
@@ -248,7 +248,7 @@
[self updateDisplayName];
if ([self isWindowLoaded]) {
- NSString *prefix = (isPasteDrag) ?
NSLocalizedString(@"Paste/Drag Data", @"Partial window title") :
NSLocalizedString(@"Source Data", @"Partial window title");
+ NSString *prefix = pasteDrag ? NSLocalizedString(@"Paste/Drag
Data", @"Partial window title") : NSLocalizedString(@"Source Data", @"Partial
window title");
[[self window] setTitle:[NSString stringWithFormat:@"%@: %@",
prefix, [manager displayName]]];
}
}
Modified: trunk/bibdesk/BDSKErrorObject.h
===================================================================
--- trunk/bibdesk/BDSKErrorObject.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKErrorObject.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -49,7 +49,7 @@
NSString *errorClassName;
NSString *errorMessage;
- BOOL isIgnorableWarning;
+ BOOL ignorableWarning;
}
+ (void)reportError:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag;
@@ -61,7 +61,7 @@
@property (nonatomic, readonly) NSInteger lineNumber;
@property (nonatomic, readonly) NSString *errorClassName;
@property (nonatomic, readonly) NSString *errorMessage;
-@property (nonatomic, readonly) BOOL isIgnorableWarning;
+@property (nonatomic, readonly, getter=isIgnorableWarning) BOOL
ignorableWarning;
@property (nonatomic, retain) BDSKErrorEditor *editor;
@property (nonatomic, retain) BibItem *publication;
Modified: trunk/bibdesk/BDSKErrorObject.m
===================================================================
--- trunk/bibdesk/BDSKErrorObject.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKErrorObject.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -45,7 +45,7 @@
@implementation BDSKErrorObject
-@synthesize fileName, lineNumber, errorClassName, errorMessage,
isIgnorableWarning, editor, publication;
+@synthesize fileName, lineNumber, errorClassName, errorMessage,
ignorableWarning, editor, publication;
- (id)initWithClassName:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag{
self = [super init];
@@ -54,7 +54,7 @@
errorMessage = [msg copy];
fileName = [filePath copy];
lineNumber = line;
- isIgnorableWarning = flag;
+ ignorableWarning = flag;
}
return self;
}
@@ -64,7 +64,7 @@
}
- (id)copyWithZone:(NSZone *)zone {
- return [[[self class] alloc] initWithClassName:errorClassName
message:errorMessage forFile:fileName line:lineNumber
isWarning:isIgnorableWarning];
+ return [[[self class] alloc] initWithClassName:errorClassName
message:errorMessage forFile:fileName line:lineNumber
isWarning:ignorableWarning];
}
- (void)dealloc {
Modified: trunk/bibdesk/BDSKField.h
===================================================================
--- trunk/bibdesk/BDSKField.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKField.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -63,7 +63,7 @@
@property (nonatomic, retain) NSString *relativePathValue;
-@property (nonatomic, readonly) BOOL isInherited;
+@property (nonatomic, readonly, getter=isInherited) BOOL inherited;
@property (nonatomic, readonly) NSArray *scriptingAuthors;
- (BibAuthor *)valueInScriptingAuthorsWithName:(NSString *)aName;
Modified: trunk/bibdesk/BDSKField.m
===================================================================
--- trunk/bibdesk/BDSKField.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKField.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -48,7 +48,7 @@
@implementation BDSKField
@synthesize publication=bibItem;
-@dynamic name, value, bibTeXString, integerValue, URLStringValue,
fileURLValue, relativePathValue, isInherited, scriptingAuthors,
scriptingPublications;
+@dynamic name, value, bibTeXString, integerValue, URLStringValue,
fileURLValue, relativePathValue, inherited, scriptingAuthors,
scriptingPublications;
+ (BOOL)accessInstanceVariablesDirectly {
return NO;
Modified: trunk/bibdesk/BDSKGroup.h
===================================================================
--- trunk/bibdesk/BDSKGroup.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKGroup.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -93,11 +93,11 @@
@property (nonatomic, readonly) BDSKGroupType groupType;
-@property (nonatomic, readonly) BOOL isNameEditable;
-@property (nonatomic, readonly) BOOL isEditable;
+@property (nonatomic, readonly, getter=isNameEditable) BOOL nameEditable;
+@property (nonatomic, readonly, getter=isEditable) BOOL editable;
@property (nonatomic, readonly) BOOL allowsRemoval;
@property (nonatomic, readonly) BOOL failedDownload;
-@property (nonatomic, readonly) BOOL isRetrieving;
+@property (nonatomic, readonly, getter=isRetrieving) BOOL retrieving;
@property (nonatomic, readonly) NSString *stringValue;
@property (nonatomic, readonly) NSNumber *numberValue;
Modified: trunk/bibdesk/BDSKGroup.m
===================================================================
--- trunk/bibdesk/BDSKGroup.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKGroup.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -50,7 +50,7 @@
@implementation BDSKGroup
@synthesize uniqueID, name, count, parent, document;
-@dynamic dictionaryValue, label, icon, groupType, isNameEditable, isEditable,
allowsRemoval, failedDownload, isRetrieving, stringValue, numberValue,
editingStringValue, cellValue, toolTip, errorMessage, macroResolver,
publications;
+@dynamic dictionaryValue, label, icon, groupType, nameEditable, editable,
allowsRemoval, failedDownload, retrieving, stringValue, numberValue,
editingStringValue, cellValue, toolTip, errorMessage, macroResolver,
publications;
static NSArray *cellValueKeys = nil;
static NSArray *noCountCellValueKeys = nil;
Modified: trunk/bibdesk/BDSKPreferencePane.h
===================================================================
--- trunk/bibdesk/BDSKPreferencePane.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKPreferencePane.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -42,7 +42,7 @@
@interface BDSKPreferencePane : NSViewController {
BDSKPreferenceController *preferenceController;
- BOOL isViewLoaded;
+ BOOL viewLoaded;
NSUserDefaults *sud;
NSUserDefaultsController *sudc;
}
@@ -61,7 +61,7 @@
@property (nonatomic, readonly) NSURL *helpURL;
@property (nonatomic, readonly) NSDictionary *initialValues;
-@property (nonatomic, readonly) BOOL isViewLoaded;
+@property (nonatomic, readonly, getter=isViewLoaded) BOOL viewLoaded;
// 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-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKPreferencePane.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -43,7 +43,8 @@
@implementation BDSKPreferencePane
-@dynamic preferenceController, record, identifier, label, toolTip, icon,
helpAnchor, helpURL, initialValues, isViewLoaded;
+@synthesize viewLoaded;
+@dynamic preferenceController, record, identifier, label, toolTip, icon,
helpAnchor, helpURL, initialValues;
- (id)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController {
self = [super initWithNibName:[aRecord nibName] ?: [self nibName]
bundle:nil];
@@ -50,7 +51,7 @@
if (self) {
[self setRepresentedObject:aRecord];
preferenceController = aController;
- isViewLoaded = NO;
+ viewLoaded = NO;
sud = [NSUserDefaults standardUserDefaults];
sudc = [NSUserDefaultsController sharedUserDefaultsController];
}
@@ -59,13 +60,9 @@
- (void)loadView {
[super loadView];
- isViewLoaded = YES;
+ viewLoaded = YES;
}
-- (BOOL)isViewLoaded {
- return isViewLoaded;
-}
-
- (BDSKPreferenceController *)preferenceController {
return preferenceController;
}
Modified: trunk/bibdesk/BDSKSearchGroup.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroup.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKSearchGroup.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -60,7 +60,7 @@
@property (nonatomic, readonly) NSInteger numberOfFetchedResults;
@property (nonatomic, readonly) BOOL failedDownload;
@property (nonatomic, readonly) NSString *errorMessage;
-@property (nonatomic, readonly) BOOL isRetrieving;
+@property (nonatomic, readonly, getter=isRetrieving) BOOL retrieving;
@property (nonatomic, readonly) NSFormatter *searchStringFormatter;
- (void)retrieveWithSearchTerm:(NSString *)aSearchTerm;
- (void)reset;
Modified: trunk/bibdesk/BDSKServerInfo.h
===================================================================
--- trunk/bibdesk/BDSKServerInfo.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKServerInfo.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -75,10 +75,10 @@
@property (nonatomic, readonly, getter=isLite) BOOL lite;
@property (nonatomic, readonly) NSDictionary *options;
-@property (nonatomic, readonly) BOOL isEntrez;
-@property (nonatomic, readonly) BOOL isZoom;
-@property (nonatomic, readonly) BOOL isISI;
-@property (nonatomic, readonly) BOOL isDBLP;
+@property (nonatomic, readonly, getter=isEntrez) BOOL entrez;
+@property (nonatomic, readonly, getter=isZoom) BOOL zoom;
+@property (nonatomic, readonly, getter=isISI) BOOL ISI;
+@property (nonatomic, readonly, getter=isDBLP) BOOL DBLP;
- (BDSKServerType)serverType;
Modified: trunk/bibdesk/BDSKServerInfo.m
===================================================================
--- trunk/bibdesk/BDSKServerInfo.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BDSKServerInfo.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -68,7 +68,7 @@
@implementation BDSKServerInfo
@synthesize type, name, database;
-@dynamic dictionaryValue, host, port, password, username, recordSyntax,
resultEncoding, removeDiacritics, lite, options, isEntrez, isZoom, isISI,
isDBLP;
+@dynamic dictionaryValue, host, port, password, username, recordSyntax,
resultEncoding, removeDiacritics, lite, options, entrez, zoom, ISI, DBLP;
+ (id)defaultServerInfoWithType:(NSString *)aType;
{
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BibDocument.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -296,7 +296,7 @@
@property (nonatomic, assign) IBOutlet NSMenu *actionMenu;
@property (nonatomic, assign) IBOutlet NSMenu *alternateCopyMenu;
-@property (nonatomic, readonly) BOOL isMainDocument;
+@property (nonatomic, readonly, getter=isMainDocument) BOOL mainDocument;
- (BOOL)commitPendingEdits;
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BibDocument.m 2019-07-19 09:46:56 UTC (rev 24061)
@@ -187,7 +187,7 @@
@implementation BibDocument
@synthesize documentWindow, tableView, splitView, mainBox, mainView,
statusBar, groupOutlineView, groupSplitView, groupActionButton, groupAddButton,
groupButtonView, groupFieldMenu, sidePreviewTabView, sidePreviewTextView,
sideFileView, sidePreviewButton, bottomPreviewTabView, bottomPreviewTextView,
bottomFileView, bottomPreviewButton, actionMenuButton, groupActionMenuButton,
searchField, groupMenu, actionMenu, alternateCopyMenu, publications,
shownPublications, groups, documentInfo, searchIndexes, macroResolver;
-@dynamic mainWindowSetupDictionaryFromExtendedAttributes, isMainDocument,
atomData, MODSData, endNoteData, wordXMLData, numberOfSelectedPubs,
numberOfClickedOrSelectedPubs, selectedPublications,
clickedOrSelectedPublications, singleSelectedPublication, selectedFileURLs,
clickedOrSelectedFileURLs, selectedRemoteURLs, clickedOrSelectedRemoteURLs,
documentStringEncoding;
+@dynamic mainWindowSetupDictionaryFromExtendedAttributes, mainDocument,
atomData, MODSData, endNoteData, wordXMLData, numberOfSelectedPubs,
numberOfClickedOrSelectedPubs, selectedPublications,
clickedOrSelectedPublications, singleSelectedPublication, selectedFileURLs,
clickedOrSelectedFileURLs, selectedRemoteURLs, clickedOrSelectedRemoteURLs,
documentStringEncoding;
+ (void)initialize {
BDSKINITIALIZE;
Modified: trunk/bibdesk/BibDocument_UI.h
===================================================================
--- trunk/bibdesk/BibDocument_UI.h 2019-07-19 09:27:03 UTC (rev 24060)
+++ trunk/bibdesk/BibDocument_UI.h 2019-07-19 09:46:56 UTC (rev 24061)
@@ -57,10 +57,10 @@
- (void)updateStatus;
-@property (nonatomic, readonly) BOOL isDisplayingSearchButtons;
-@property (nonatomic, readonly) BOOL isDisplayingFileContentSearch;
-@property (nonatomic, readonly) BOOL isDisplayingSearchGroupView;
-@property (nonatomic, readonly) BOOL isDisplayingWebGroupView;
+@property (nonatomic, readonly, getter=isDisplayingSearchButtons) BOOL
displayingSearchButtons;
+@property (nonatomic, readonly, getter=isDisplayingFileContentSearch) BOOL
displayingFileContentSearch;
+@property (nonatomic, readonly, getter=isDisplayingSearchGroupView) BOOL
displayingSearchGroupView;
+@property (nonatomic, readonly, getter=isDisplayingWebGroupView) BOOL
displayingWebGroupView;
- (void)addControlView:(NSView *)controlView;
- (void)removeControlView:(NSView *)controlView;
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
