Revision: 24022
http://sourceforge.net/p/bibdesk/svn/24022
Author: hofman
Date: 2019-07-14 16:59:32 +0000 (Sun, 14 Jul 2019)
Log Message:
-----------
Use properties for many data classes
Modified Paths:
--------------
trunk/bibdesk/BDSKAlias.h
trunk/bibdesk/BDSKAlias.m
trunk/bibdesk/BDSKBookmark.h
trunk/bibdesk/BDSKBookmark.m
trunk/bibdesk/BDSKCondition.h
trunk/bibdesk/BDSKCondition.m
trunk/bibdesk/BDSKErrorObject.h
trunk/bibdesk/BDSKErrorObject.m
trunk/bibdesk/BDSKFileSearchResult.h
trunk/bibdesk/BDSKFileSearchResult.m
trunk/bibdesk/BDSKFilter.h
trunk/bibdesk/BDSKFilter.m
trunk/bibdesk/BDSKGroupsArray.h
trunk/bibdesk/BDSKGroupsArray.m
trunk/bibdesk/BDSKPreferenceRecord.h
trunk/bibdesk/BDSKPreferenceRecord.m
trunk/bibdesk/BDSKScriptHook.h
trunk/bibdesk/BDSKScriptHook.m
trunk/bibdesk/BDSKSearchBookmark.h
trunk/bibdesk/BDSKSearchBookmark.m
trunk/bibdesk/BDSKServerInfo.h
trunk/bibdesk/BDSKServerInfo.m
trunk/bibdesk/BDSKStringNode.h
trunk/bibdesk/BDSKStringNode.m
trunk/bibdesk/BDSKTemplate.h
trunk/bibdesk/BDSKTemplate.m
trunk/bibdesk/BDSKTemplateObjectProxy.h
trunk/bibdesk/BDSKTemplateObjectProxy.m
trunk/bibdesk/BDSKTemplateTag.h
trunk/bibdesk/BDSKTemplateTag.m
trunk/bibdesk/BDSKToken.h
trunk/bibdesk/BDSKToken.m
trunk/bibdesk/BDSKTreeNode.h
trunk/bibdesk/BDSKTreeNode.m
trunk/bibdesk/BDSKTypeTemplate.h
trunk/bibdesk/BDSKTypeTemplate.m
trunk/bibdesk/BDSKVersionNumber.h
trunk/bibdesk/BDSKVersionNumber.m
Modified: trunk/bibdesk/BDSKAlias.h
===================================================================
--- trunk/bibdesk/BDSKAlias.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKAlias.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -49,8 +49,8 @@
- (id)initWithData:(NSData *)data;
- (id)initWithURL:(NSURL *)fileURL;
-- (NSData *)data;
-- (NSURL *)fileURL;
-- (NSURL *)fileURLNoUI;
+@property (nonatomic, readonly) NSData *data;
+@property (nonatomic, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) NSURL *fileURLNoUI;
@end
Modified: trunk/bibdesk/BDSKAlias.m
===================================================================
--- trunk/bibdesk/BDSKAlias.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKAlias.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -41,6 +41,8 @@
@implementation BDSKAlias
+@dynamic data, fileURL, fileURLNoUI;
+
+ (id)aliasWithData:(NSData *)data {
return [[[self alloc] initWithData:data] autorelease];
}
Modified: trunk/bibdesk/BDSKBookmark.h
===================================================================
--- trunk/bibdesk/BDSKBookmark.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKBookmark.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -59,20 +59,16 @@
- (id)initSeparator;
- (id)initWithDictionary:(NSDictionary *)dictionary;
-- (NSDictionary *)dictionaryValue;
+@property (nonatomic, readonly) NSDictionary *dictionaryValue;
-- (BDSKBookmarkType)bookmarkType;
+@property (nonatomic, readonly) BDSKBookmarkType bookmarkType;
-- (NSURL *)URL;
-- (void)setURL:(NSURL *)newURL;
+@property (nonatomic, retain) NSURL *URL;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, readonly) NSImage *icon;
-- (NSString *)name;
-- (void)setName:(NSString *)newName;
+@property (nonatomic, assign) BDSKBookmark *parent;
-- (NSImage *)icon;
-
-- (BDSKBookmark *)parent;
-- (void)setParent:(BDSKBookmark *)newParent;
- (NSArray *)children;
- (NSUInteger)countOfChildren;
- (BDSKBookmark *)objectInChildrenAtIndex:(NSUInteger)idx;
Modified: trunk/bibdesk/BDSKBookmark.m
===================================================================
--- trunk/bibdesk/BDSKBookmark.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKBookmark.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -75,6 +75,9 @@
@implementation BDSKBookmark
+@synthesize parent;
+@dynamic dictionaryValue, bookmarkType, URL, name, icon;
+
static BDSKPlaceholderBookmark *defaultPlaceholderBookmark = nil;
static Class BDSKBookmarkClass = Nil;
@@ -157,14 +160,6 @@
- (void)insertObject:(BDSKBookmark *)child inChildrenAtIndex:(NSUInteger)idx {}
- (void)removeObjectFromChildrenAtIndex:(NSUInteger)idx {}
-- (BDSKBookmark *)parent {
- return parent;
-}
-
-- (void)setParent:(BDSKBookmark *)newParent {
- parent = newParent;
-}
-
- (BOOL)isDescendantOf:(BDSKBookmark *)bookmark {
if (self == bookmark)
return YES;
Modified: trunk/bibdesk/BDSKCondition.h
===================================================================
--- trunk/bibdesk/BDSKCondition.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKCondition.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -116,55 +116,40 @@
- (id)initWithDictionary:(NSDictionary *)dictionary;
-- (NSDictionary *)dictionaryValue;
+@property (nonatomic, readonly) NSDictionary *dictionaryValue;
- (BOOL)isSatisfiedByItem:(BibItem *)item;
// Generic accessors
-- (NSString *)key;
-- (void)setKey:(NSString *)newKey;
-- (NSString *)value;
-- (void)setValue:(NSString *)newValue;
-- (NSInteger)comparison;
-- (void)setComparison:(NSInteger)newComparison;
+@property (nonatomic, retain) NSString *key;
+@property (nonatomic, retain) NSString *value;
+@property (nonatomic) NSInteger comparison;
-- (NSString *)primitiveKey;
-- (void)setPrimitiveKey:(NSString *)newKey;
+@property (nonatomic, retain) NSString *primitiveKey;
// String accessors
-- (BDSKStringComparison)stringComparison;
-- (void)setStringComparison:(BDSKStringComparison)newComparison;
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)newValue;
+@property (nonatomic) BDSKStringComparison stringComparison;
+@property (nonatomic, retain) NSString *stringValue;
// Count accessors
-- (BDSKAttachmentComparison)attachmentComparison;
-- (void)setAttachmentComparison:(BDSKAttachmentComparison)newComparison;
-- (NSInteger)countValue;
-- (void)setCountValue:(NSInteger)newValue;
+@property (nonatomic) BDSKAttachmentComparison attachmentComparison;
+@property (nonatomic) NSInteger countValue;
// Date accessors
-- (BDSKDateComparison)dateComparison;
-- (void)setDateComparison:(BDSKDateComparison)newComparison;
-- (NSInteger)numberValue;
-- (void)setNumberValue:(NSInteger)value;
-- (NSInteger)andNumberValue;
-- (void)setAndNumberValue:(NSInteger)value;
-- (BDSKPeriod)periodValue;
-- (void)setPeriodValue:(BDSKPeriod)value;
-- (NSDate *)dateValue;
-- (void)setDateValue:(NSDate *)value;
-- (NSDate *)toDateValue;
-- (void)setToDateValue:(NSDate *)value;
+@property (nonatomic) BDSKDateComparison dateComparison;
+@property (nonatomic) NSInteger numberValue;
+@property (nonatomic) NSInteger andNumberValue;
+@property (nonatomic) BDSKPeriod periodValue;
+@property (nonatomic, retain) NSDate *dateValue;
+@property (nonatomic, retain) NSDate *toDateValue;
- (void)setDefaultComparison;
- (void)setDefaultValue;
-- (BOOL)isDateCondition;
-- (BOOL)isAttachmentCondition;
+@property (nonatomic, readonly) BOOL isDateCondition;
+@property (nonatomic, readonly) BOOL isAttachmentCondition;
-- (id<BDSKSmartGroup>)group;
-- (void)setGroup:(id<BDSKSmartGroup>)newGroup;
+@property (nonatomic, assign) id<BDSKSmartGroup> group;
@end
Modified: trunk/bibdesk/BDSKCondition.m
===================================================================
--- trunk/bibdesk/BDSKCondition.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKCondition.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -59,6 +59,9 @@
@implementation BDSKCondition
+@synthesize stringComparison, attachmentComparison, countValue,
dateComparison, numberValue, andNumberValue, periodValue, group;
+@dynamic dictionaryValue, key, value, comparison, primitiveKey, stringValue,
dateValue, toDateValue, isDateCondition, isAttachmentCondition;
+
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([key isEqualToString:@"comparison"])
@@ -479,14 +482,6 @@
#pragma mark | strings
-- (BDSKStringComparison)stringComparison {
- return stringComparison;
-}
-
-- (void)setStringComparison:(BDSKStringComparison)newComparison {
- stringComparison = newComparison;
-}
-
- (NSString *)stringValue {
return [[stringValue retain] autorelease];
}
@@ -502,28 +497,8 @@
#pragma mark | count (linked files/URLs)
-- (BDSKAttachmentComparison)attachmentComparison {
- return attachmentComparison;
-}
-
-- (void)setAttachmentComparison:(BDSKAttachmentComparison)newComparison {
- attachmentComparison = newComparison;
-}
-
-- (NSInteger)countValue {
- return countValue;
-}
-
-- (void)setCountValue:(NSInteger)newValue {
- countValue = newValue;
-}
-
#pragma mark | dates
-- (BDSKDateComparison)dateComparison {
- return dateComparison;
-}
-
- (void)setDateComparison:(BDSKDateComparison)newComparison {
if (dateComparison != newComparison) {
dateComparison = newComparison;
@@ -531,10 +506,6 @@
}
}
-- (NSInteger)numberValue {
- return numberValue;
-}
-
- (void)setNumberValue:(NSInteger)newNumber {
if (numberValue != newNumber) {
numberValue = newNumber;
@@ -542,10 +513,6 @@
}
}
-- (NSInteger)andNumberValue {
- return andNumberValue;
-}
-
- (void)setAndNumberValue:(NSInteger)newNumber {
if (andNumberValue != newNumber) {
andNumberValue = newNumber;
@@ -553,10 +520,6 @@
}
}
-- (BDSKPeriod)periodValue {
- return periodValue;
-}
-
- (void)setPeriodValue:(BDSKPeriod)newPeriod {
if (periodValue != newPeriod) {
periodValue = newPeriod;
@@ -648,10 +611,6 @@
}
}
-- (id<BDSKSmartGroup>)group {
- return group;
-}
-
- (void)setGroup:(id<BDSKSmartGroup>)newGroup {
if (group != newGroup) {
group = newGroup;
Modified: trunk/bibdesk/BDSKErrorObject.h
===================================================================
--- trunk/bibdesk/BDSKErrorObject.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKErrorObject.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -57,20 +57,12 @@
- (id)initWithClassName:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag;
-- (NSString *)fileName;
+@property (nonatomic, readonly) NSString *fileName;
+@property (nonatomic, readonly) NSInteger lineNumber;
+@property (nonatomic, readonly) NSString *errorClassName;
+@property (nonatomic, readonly) NSString *errorMessage;
+@property (nonatomic, readonly) BOOL isIgnorableWarning;
+@property (nonatomic, retain) BDSKErrorEditor *editor;
+@property (nonatomic, retain) BibItem *publication;
-- (NSInteger)lineNumber;
-
-- (NSString *)errorClassName;
-
-- (NSString *)errorMessage;
-
-- (BOOL)isIgnorableWarning;
-
-- (BDSKErrorEditor *)editor;
-- (void)setEditor:(BDSKErrorEditor *)newEditor;
-
-- (BibItem *)publication;
-- (void)setPublication:(BibItem *)newPublication;
-
@end
Modified: trunk/bibdesk/BDSKErrorObject.m
===================================================================
--- trunk/bibdesk/BDSKErrorObject.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKErrorObject.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -45,6 +45,8 @@
@implementation BDSKErrorObject
+@synthesize fileName, lineNumber, errorClassName, errorMessage,
isIgnorableWarning, editor, publication;
+
- (id)initWithClassName:(NSString *)className message:(NSString *)msg
forFile:(NSString *)filePath line:(NSInteger)line isWarning:(BOOL)flag{
self = [super init];
if (self) {
@@ -88,46 +90,4 @@
return [NSString stringWithFormat:@"<%@ file: %@, line: %ld\n\terror
class: %@, error message: %@\n\teditor: %@>", [self class], fileName,
(long)lineNumber, errorClassName, errorMessage, editor];
}
-- (NSString *)fileName {
- return fileName;
-}
-
-- (NSInteger)lineNumber {
- return lineNumber;
-}
-
-- (NSString *)errorClassName {
- return errorClassName;
-}
-
-- (NSString *)errorMessage {
- return errorMessage;
-}
-
-- (BOOL)isIgnorableWarning {
- return isIgnorableWarning;
-}
-
-- (BDSKErrorEditor *)editor {
- return editor;
-}
-
-- (void)setEditor:(BDSKErrorEditor *)newEditor {
- if (editor != newEditor) {
- [editor release];
- editor = [newEditor retain];
- }
-}
-
-- (BibItem *)publication {
- return publication;
-}
-
-- (void)setPublication:(BibItem *)newPublication{
- if (publication != newPublication) {
- [publication release];
- publication = [newPublication retain];
- }
-}
-
@end
Modified: trunk/bibdesk/BDSKFileSearchResult.h
===================================================================
--- trunk/bibdesk/BDSKFileSearchResult.h 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKFileSearchResult.h 2019-07-14 16:59:32 UTC (rev
24022)
@@ -53,12 +53,11 @@
- (id)initWithURL:(NSURL *)aURL identifierURL:(NSURL *)anIdentifierURL
title:(NSString *)aTitle score:(CGFloat)aScore;
// used by the table cell
-- (NSImage *)image;
-- (NSString *)string;
-- (void)setScore:(double)newScore;
-- (double)score;
-- (NSURL *)identifierURL;
-- (NSURL *)URL;
+@property (nonatomic, readonly) NSImage *image;
+@property (nonatomic, readonly) NSString *string;
+@property (nonatomic) double score;
+@property (nonatomic, readonly) NSURL *identifierURL;
+@property (nonatomic, readonly) NSURL *URL;
@end
Modified: trunk/bibdesk/BDSKFileSearchResult.m
===================================================================
--- trunk/bibdesk/BDSKFileSearchResult.m 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKFileSearchResult.m 2019-07-14 16:59:32 UTC (rev
24022)
@@ -41,6 +41,8 @@
@implementation BDSKFileSearchResult
+@synthesize image, string, score, identifierURL, URL;
+
- (id)initWithURL:(NSURL *)aURL identifierURL:(NSURL *)anIdentifierURL
title:(NSString *)aTitle score:(CGFloat)aScore;
{
@@ -92,12 +94,5 @@
return ([anObject isKindOfClass:[self class]] && [((BDSKFileSearchResult
*)anObject)->url isEqual:url] && [((BDSKFileSearchResult
*)anObject)->identifierURL isEqual:identifierURL]);
}
-- (NSImage *)image { return image; }
-- (NSString *)string { return string; }
-- (NSURL *)identifierURL { return identifierURL; }
-- (NSURL *)URL { return url; }
-- (void)setScore:(double)newScore { score = newScore; }
-- (double)score { return score; }
-
@end
Modified: trunk/bibdesk/BDSKFilter.h
===================================================================
--- trunk/bibdesk/BDSKFilter.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKFilter.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -56,18 +56,15 @@
- (id)initWithConditions:(NSArray *)aConditions
conjunction:(BDSKConjunction)aConjunction;
- (id)initWithDictionary:(NSDictionary *)dictionary;
-- (NSDictionary *)dictionaryValue;
+@property (nonatomic, readonly) NSDictionary *dictionaryValue;
- (BOOL)testItem:(BibItem *)item;
-- (NSArray *)conditions;
-- (void)setConditions:(NSArray *)newConditions;
-- (BDSKConjunction)conjunction;
-- (void)setConjunction:(BDSKConjunction)newConjunction;
+@property (nonatomic, retain) NSArray *conditions;
+@property (nonatomic) BDSKConjunction conjunction;
-- (id<BDSKSmartGroup>)group;
-- (void)setGroup:(id<BDSKSmartGroup>)newGroup;
+@property (nonatomic, assign) id<BDSKSmartGroup> group;
-- (NSUndoManager *)undoManager;
+@property (nonatomic, readonly) NSUndoManager *undoManager;
@end
Modified: trunk/bibdesk/BDSKFilter.m
===================================================================
--- trunk/bibdesk/BDSKFilter.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKFilter.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -46,6 +46,9 @@
@implementation BDSKFilter
+@synthesize conjunction, group;
+@dynamic dictionaryValue, conditions, undoManager;
+
- (id)init {
BDSKCondition *condition = [[BDSKCondition alloc] init];
NSArray *newConditions = [[NSArray alloc] initWithObjects:condition,
nil];
@@ -169,10 +172,6 @@
}
}
-- (BDSKConjunction)conjunction {
- return conjunction;
-}
-
- (void)setConjunction:(BDSKConjunction)newConjunction {
if (conjunction != newConjunction) {
[[[self undoManager] prepareWithInvocationTarget:self]
setConjunction:conjunction];
@@ -184,10 +183,6 @@
}
}
-- (id<BDSKSmartGroup>)group {
- return group;
-}
-
- (void)setGroup:(id<BDSKSmartGroup>)newGroup {
group = newGroup;
[conditions setValue:group forKey:@"group"];
Modified: trunk/bibdesk/BDSKGroupsArray.h
===================================================================
--- trunk/bibdesk/BDSKGroupsArray.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKGroupsArray.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -51,24 +51,24 @@
- (id)initWithDocument:(BibDocument *)aDocument;
-- (BDSKLibraryParentGroup *)libraryParent;
-- (BDSKExternalParentGroup *)externalParent;
-- (BDSKSmartParentGroup *)smartParent;
-- (BDSKStaticParentGroup *)staticParent;
-- (NSArray *)categoryParents;
+@property (nonatomic, readonly) BDSKLibraryParentGroup *libraryParent;
+@property (nonatomic, readonly) BDSKExternalParentGroup *externalParent;
+@property (nonatomic, readonly) BDSKSmartParentGroup *smartParent;
+@property (nonatomic, readonly) BDSKStaticParentGroup *staticParent;
+@property (nonatomic, readonly) NSArray *categoryParents;
-- (BDSKLibraryGroup *)libraryGroup;
-- (BDSKLastImportGroup *)lastImportGroup;
-- (NSArray *)sharedGroups;
-- (NSArray *)URLGroups;
-- (NSArray *)scriptGroups;
-- (NSArray *)searchGroups;
-- (NSArray *)webGroups;
-- (NSArray *)smartGroups;
-- (NSArray *)staticGroups;
-- (NSArray *)categoryGroups;
+@property (nonatomic, readonly) BDSKLibraryGroup *libraryGroup;
+@property (nonatomic, readonly) BDSKLastImportGroup *lastImportGroup;
+@property (nonatomic, readonly) NSArray *sharedGroups;
+@property (nonatomic, readonly) NSArray *URLGroups;
+@property (nonatomic, readonly) NSArray *scriptGroups;
+@property (nonatomic, readonly) NSArray *searchGroups;
+@property (nonatomic, readonly) NSArray *webGroups;
+@property (nonatomic, readonly) NSArray *smartGroups;
+@property (nonatomic, readonly) NSArray *staticGroups;
+@property (nonatomic, readonly) NSArray *categoryGroups;
-- (NSArray *)allChildren;
+@property (nonatomic, readonly) NSArray *allChildren;
- (void)addCategoryParent:(BDSKCategoryParentGroup *)group;
- (void)removeCategoryParent:(BDSKCategoryParentGroup *)group;
@@ -92,7 +92,7 @@
- (void)sortUsingDescriptors:(NSArray *)sortDescriptors;
-- (BibDocument *)document;
+@property (nonatomic, readonly) BibDocument *document;
- (void)setGroupsOfType:(BDSKGroupType)groupType fromSerializedData:(NSData
*)data;
- (NSData *)serializedGroupsDataOfType:(BDSKGroupType)groupType;
Modified: trunk/bibdesk/BDSKGroupsArray.m
===================================================================
--- trunk/bibdesk/BDSKGroupsArray.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKGroupsArray.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -65,6 +65,9 @@
@implementation BDSKGroupsArray
+@synthesize document;
+@dynamic libraryParent, externalParent, smartParent, staticParent,
categoryParents, libraryGroup, lastImportGroup, sharedGroups, URLGroups,
scriptGroups, searchGroups, webGroups, smartGroups, staticGroups,
categoryGroups, allChildren;
+
- (id)initWithDocument:(BibDocument *)aDocument {
if(self = [super init]) {
groups = [[NSMutableArray alloc] init];
@@ -306,12 +309,6 @@
[groups makeObjectsPerformSelector:@selector(removeAllUndoableChildren)];
}
-#pragma mark Document
-
-- (BibDocument *)document{
- return document;
-}
-
#pragma mark Sorting
- (void)sortUsingDescriptors:(NSArray *)sortDescriptors{
Modified: trunk/bibdesk/BDSKPreferenceRecord.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceRecord.h 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKPreferenceRecord.h 2019-07-14 16:59:32 UTC (rev
24022)
@@ -47,17 +47,17 @@
- (id)initWithDictionary:(NSDictionary *)aDictionary;
-- (NSString *)identifier;
-- (Class)paneClass;
-- (NSString *)nibName;
-- (NSString *)title;
-- (NSString *)label;
-- (NSString *)toolTip;
-- (NSImage *)icon;
-- (NSString *)helpAnchor;
-- (NSURL *)helpURL;
-- (NSDictionary *)initialValues;
-- (NSArray *)searchTerms;
-- (NSDictionary *)dictionary;
+@property (nonatomic, readonly) NSString *identifier;
+@property (nonatomic, readonly) Class paneClass;
+@property (nonatomic, readonly) NSString *nibName;
+@property (nonatomic, readonly) NSString *title;
+@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;
+@property (nonatomic, readonly) NSArray *searchTerms;
+@property (nonatomic, readonly) NSDictionary *dictionary;
@end
Modified: trunk/bibdesk/BDSKPreferenceRecord.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceRecord.m 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKPreferenceRecord.m 2019-07-14 16:59:32 UTC (rev
24022)
@@ -52,6 +52,9 @@
@implementation BDSKPreferenceRecord
+@synthesize icon, helpURL, dictionary;
+@dynamic identifier, paneClass, nibName, title, label, toolTip, helpAnchor,
initialValues, searchTerms;
+
- (id)initWithDictionary:(NSDictionary *)aDictionary {
self = [super init];
if (self) {
@@ -88,18 +91,12 @@
- (NSString *)toolTip { return [dictionary objectForKey:TOOL_TIP_KEY]; }
-- (NSImage *)icon { return icon; }
-
- (NSString *)helpAnchor { return [dictionary objectForKey:HELP_ANCHOR_KEY]; }
-- (NSURL *)helpURL { return helpURL; }
-
- (NSDictionary *)initialValues { return [dictionary
objectForKey:INITIAL_VALUES_KEY]; }
- (NSArray *)searchTerms { return [dictionary objectForKey:SEARCH_TERMS_KEY]; }
-- (NSDictionary *)dictionary { return dictionary; }
-
- (id)valueForUndefinedKey:(NSString *)key { return [dictionary
valueForKey:key]; }
@end
Modified: trunk/bibdesk/BDSKScriptHook.h
===================================================================
--- trunk/bibdesk/BDSKScriptHook.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKScriptHook.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -59,85 +59,13 @@
*/
- (id)initWithName:(NSString *)aName script:(BDSKAppleScript *)aScript;
-/*!
- @method name
- @abstract Returns the name of the script hook.
- @discussion -
-*/
-- (NSString *)name;
+@property (nonatomic, readonly) NSString *name;
+@property (nonatomic, readonly) NSString *uniqueID;
+@property (nonatomic, retain) NSString *field;
+@property (nonatomic, retain) NSArray *oldValues;
+@property (nonatomic, retain) NSArray *newValues;
+- (NSArray *)newValues __attribute__((objc_method_family(none)));
+@property (nonatomic, retain) BibDocument *document;
+@property (nonatomic, readonly) BDSKAppleScript *script;
-/*!
- @method uniqueID
- @abstract Returns the unique ID of the script hook.
- @discussion -
-*/
-- (NSString *)uniqueID;
-
-/*!
- @method field
- @abstract Returns the field name for the script hook event.
- @discussion -
-*/
-- (NSString *)field;
-
-/*!
- @method setField:
- @abstract Set the field name for the script hook event.
- @discussion -
- @param newField The field name to set.
-*/
-- (void)setField:(NSString *)newField;
-
-/*!
- @method oldValues
- @abstract Returns the array of old values for the field of the script
hook event.
- @discussion -
-*/
-- (NSArray *)oldValues;
-
-/*!
- @method setOldValue:
- @abstract Set the array of old values for the field of the script hook
event.
- @discussion -
- @param values The array of values to set.
-*/
-- (void)setOldValues:(NSArray *)values;
-
-/*!
- @method newValues
- @abstract Returns the array of new values for the field of the script
hook event.
- @discussion -
-*/
-- (NSArray *)newValues;
-
-/*!
- @method setNewValues:
- @abstract Set the array of new values for the field of the script hook
event.
- @discussion -
- @param values The array of values to set.
-*/
-- (void)setNewValues:(NSArray *)values;
-
-/*!
- @method document
- @abstract Returns the document of the script hook event.
- @discussion -
-*/
-- (BibDocument *)document;
-
-/*!
- @method setDocument:
- @abstract Set the array of new values for the field of the script hook
event.
- @discussion -
- @param values The array of values to set.
-*/
-- (void)setDocument:(BibDocument *)newDocument;
-
-/*!
- @method script
- @abstract Returns the script to execute by the script hook.
- @discussion -
-*/
-- (BDSKAppleScript *)script;
-
@end
Modified: trunk/bibdesk/BDSKScriptHook.m
===================================================================
--- trunk/bibdesk/BDSKScriptHook.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKScriptHook.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -43,6 +43,8 @@
@implementation BDSKScriptHook
+@synthesize name, uniqueID, field, oldValues, newValues, document, script;
+
// old designated initializer, shouldn't be used
- (id)init {
return [self initWithName:nil script:nil];
@@ -83,60 +85,4 @@
return [NSString stringWithFormat:@"<%@: name=%@, uniqueID=%@>", [self
class], name, uniqueID];
}
-- (NSString *)name {
- return name;
-}
-
-- (NSString *)uniqueID {
- return uniqueID;
-}
-
-- (BDSKAppleScript *)script {
- return script;
-}
-
-- (NSString *)field {
- return field;
-}
-
-- (void)setField:(NSString *)newField {
- if (![field isEqualToString:newField]) {
- [field release];
- field = [newField retain];
- }
-}
-
-- (NSArray *)oldValues {
- return oldValues;
-}
-
-- (void)setOldValues:(NSArray *)values {
- if (oldValues != values) {
- [oldValues release];
- oldValues = [values retain];
- }
-}
-
-- (NSArray *)newValues {
- return newValues;
-}
-
-- (void)setNewValues:(NSArray *)values {
- if (newValues != values) {
- [newValues release];
- newValues = [values retain];
- }
-}
-
-- (BibDocument *)document {
- return document;
-}
-
-- (void)setDocument:(BibDocument *)newDocument {
- if (document != newDocument) {
- [document release];
- document = [newDocument retain];
- }
-}
-
@end
Modified: trunk/bibdesk/BDSKSearchBookmark.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKSearchBookmark.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -59,20 +59,18 @@
- (id)initWithInfo:(NSDictionary *)aDictionary label:(NSString *)aLabel;
- (id)initWithDictionary:(NSDictionary *)dictionary;
-- (NSDictionary *)dictionaryValue;
+@property (nonatomic, readonly) NSDictionary *dictionaryValue;
-- (BDSKSearchBookmarkType)bookmarkType;
+@property (nonatomic, readonly) BDSKSearchBookmarkType bookmarkType;
-- (NSDictionary *)info;
-- (void)setInfo:(NSDictionary *)newInfo;
+@property (nonatomic, retain) NSDictionary *info;
-- (NSString *)label;
-- (void)setLabel:(NSString *)newLabel;
+@property (nonatomic, retain) NSString *label;
-- (NSImage *)icon;
+@property (nonatomic, readonly) NSImage *icon;
-- (BDSKSearchBookmark *)parent;
-- (void)setParent:(BDSKSearchBookmark *)newParent;
+@property (nonatomic, assign) BDSKSearchBookmark *parent;
+
- (NSArray *)children;
- (NSUInteger)countOfChildren;
- (BDSKSearchBookmark *)objectInChildrenAtIndex:(NSUInteger)idx;
Modified: trunk/bibdesk/BDSKSearchBookmark.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKSearchBookmark.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -74,6 +74,9 @@
@implementation BDSKSearchBookmark
+@synthesize parent;
+@dynamic dictionaryValue, bookmarkType, info, label, icon;
+
static BDSKPlaceholderSearchBookmark *defaultPlaceholderSearchBookmark = nil;
static Class BDSKSearchBookmarkClass = Nil;
@@ -156,14 +159,6 @@
- (void)insertObject:(BDSKSearchBookmark *)child
inChildrenAtIndex:(NSUInteger)idx {}
- (void)removeObjectFromChildrenAtIndex:(NSUInteger)idx {}
-- (BDSKSearchBookmark *)parent {
- return parent;
-}
-
-- (void)setParent:(BDSKSearchBookmark *)newParent {
- parent = newParent;
-}
-
- (BOOL)isDescendantOf:(BDSKSearchBookmark *)bookmark {
if (self == bookmark)
return YES;
Modified: trunk/bibdesk/BDSKServerInfo.h
===================================================================
--- trunk/bibdesk/BDSKServerInfo.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKServerInfo.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -60,25 +60,25 @@
- (id)initWithDictionary:(NSDictionary *)info;
-- (NSDictionary *)dictionaryValue;
+@property (nonatomic, readonly) NSDictionary *dictionaryValue;
-- (NSString *)type;
-- (NSString *)name;
-- (NSString *)database;
-- (NSString *)host;
-- (NSString *)port;
-- (NSString *)password;
-- (NSString *)username;
-- (NSString *)recordSyntax;
-- (NSString *)resultEncoding;
-- (BOOL)removeDiacritics;
-- (BOOL)isLite;
-- (NSDictionary *)options;
+@property (nonatomic, readonly) NSString *type;
+@property (nonatomic, readonly) NSString *name;
+@property (nonatomic, readonly) NSString *database;
+@property (nonatomic, readonly) NSString *host;
+@property (nonatomic, readonly) NSString *port;
+@property (nonatomic, readonly) NSString *password;
+@property (nonatomic, readonly) NSString *username;
+@property (nonatomic, readonly) NSString *recordSyntax;
+@property (nonatomic, readonly) NSString *resultEncoding;
+@property (nonatomic, readonly) BOOL removeDiacritics;
+@property (nonatomic, readonly, getter=isLite) BOOL lite;
+@property (nonatomic, readonly) NSDictionary *options;
-- (BOOL)isEntrez;
-- (BOOL)isZoom;
-- (BOOL)isISI;
-- (BOOL)isDBLP;
+@property (nonatomic, readonly) BOOL isEntrez;
+@property (nonatomic, readonly) BOOL isZoom;
+@property (nonatomic, readonly) BOOL isISI;
+@property (nonatomic, readonly) BOOL isDBLP;
- (BDSKServerType)serverType;
@@ -86,17 +86,17 @@
@interface BDSKMutableServerInfo : BDSKServerInfo
-- (void)setType:(NSString *)newType;
-- (void)setName:(NSString *)newName;
-- (void)setDatabase:(NSString *)newDbase;
-- (void)setPort:(NSString *)newPort;
-- (void)setHost:(NSString *)newHost;
-- (void)setPassword:(NSString *)newPassword;
-- (void)setUsername:(NSString *)newUser;
-- (void)setRecordSyntax:(NSString *)newSyntax;
-- (void)setResultEncoding:(NSString *)newEncoding;
-- (void)setRemoveDiacritics:(BOOL)flag;
-- (void)setLite:(BOOL)flag;
-- (void)setOptions:(NSDictionary *)newOptions;
+@property (nonatomic, retain) NSString *type;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSString *database;
+@property (nonatomic, retain) NSString *host;
+@property (nonatomic, retain) NSString *port;
+@property (nonatomic, retain) NSString *password;
+@property (nonatomic, retain) NSString *username;
+@property (nonatomic, retain) NSString *recordSyntax;
+@property (nonatomic, retain) NSString *resultEncoding;
+@property (nonatomic) BOOL removeDiacritics;
+@property (nonatomic, getter=isLite) BOOL lite;
+@property (nonatomic, copy) NSDictionary *options;
@end
Modified: trunk/bibdesk/BDSKServerInfo.m
===================================================================
--- trunk/bibdesk/BDSKServerInfo.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKServerInfo.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -67,6 +67,9 @@
@implementation BDSKServerInfo
+@synthesize type, name, database;
+@dynamic dictionaryValue, host, port, password, username, recordSyntax,
resultEncoding, removeDiacritics, lite, options, isEntrez, isZoom, isISI,
isDBLP;
+
+ (id)defaultServerInfoWithType:(NSString *)aType;
{
BOOL isZoom = [aType isEqualToString:BDSKSearchGroupZoom];
@@ -205,12 +208,6 @@
return info;
}
-- (NSString *)type { return type; }
-
-- (NSString *)name { return name; }
-
-- (NSString *)database { return database; }
-
- (NSString *)host { return [self isZoom] ? host : nil; }
- (NSString *)port { return [self isZoom] ? port : nil; }
@@ -252,6 +249,8 @@
@implementation BDSKMutableServerInfo
+@dynamic type, name, database, host, port, password, username, recordSyntax,
resultEncoding, removeDiacritics, lite, options;
+
static NSSet *keysAffectedByType = nil;
static NSSet *keysAffectedByOptions = nil;
static NSSet *typeSet = nil;
Modified: trunk/bibdesk/BDSKStringNode.h
===================================================================
--- trunk/bibdesk/BDSKStringNode.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKStringNode.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -149,7 +149,7 @@
@discussion (description)
@result -
*/
-- (BDSKStringNodeType)type;
+@property (nonatomic, readonly) BDSKStringNodeType type;
/*!
@method value
@@ -157,6 +157,6 @@
@discussion (description)
@result -
*/
-- (NSString *)value;
+@property (nonatomic, readonly) NSString *value;
@end
Modified: trunk/bibdesk/BDSKStringNode.m
===================================================================
--- trunk/bibdesk/BDSKStringNode.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKStringNode.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -42,6 +42,8 @@
@implementation BDSKStringNode
+@synthesize type, value;
+
+ (BDSKStringNode *)nodeWithQuotedString:(NSString *)s{
return [[[BDSKStringNode alloc] initWithType:BDSKStringNodeString value:s]
autorelease];
}
@@ -139,14 +141,6 @@
return [value compare:[aNode value] options:mask];
}
-- (BDSKStringNodeType)type {
- return type;
-}
-
-- (NSString *)value {
- return value;
-}
-
- (NSString *)description{
return [NSString stringWithFormat:@"<%@: %ld, %@>", [self class],
(long)type, value];
}
Modified: trunk/bibdesk/BDSKTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTemplate.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTemplate.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -106,13 +106,13 @@
// top-level template accessors
-- (BDSKTemplateFormat)templateFormat;
-- (NSString *)fileExtension;
-- (NSString *)documentType;
+@property (nonatomic, readonly) BDSKTemplateFormat templateFormat;
+@property (nonatomic, readonly) NSString *fileExtension;
+@property (nonatomic, readonly) NSString *documentType;
-- (NSString *)mainPageString;
+@property (nonatomic, readonly) NSString *mainPageString;
- (NSAttributedString
*)mainPageAttributedStringWithDocumentAttributes:(NSDictionary **)docAttributes;
-- (NSString *)scriptPath;
+@property (nonatomic, readonly) NSString *scriptPath;
// returns the contents of a child for the given type or of the default
template
// (pass nil for the type if you explicitly desire the default template
content)
@@ -120,15 +120,16 @@
- (NSString *)stringForType:(NSString *)type;
- (NSAttributedString *)attributedStringForType:(NSString *)type;
-- (NSURL *)mainPageTemplateURL;
-- (NSURL *)defaultItemTemplateURL;
+@property (nonatomic, readonly) NSURL *mainPageTemplateURL;
+@property (nonatomic, readonly) NSURL *defaultItemTemplateURL;
+
- (NSURL *)templateURLForType:(NSString *)pubType;
-- (NSArray *)accessoryFileURLs;
-- (NSURL *)scriptURL;
+@property (nonatomic, readonly) NSArray *accessoryFileURLs;
+@property (nonatomic, readonly) NSURL *scriptURL;
+
// child template accessors
-- (NSURL *)representedFileURL;
-- (void)setRepresentedFileURL:(NSURL *)aURL;
+@property (nonatomic, retain) NSURL *representedFileURL;
// other methods
- (BOOL)addChildWithURL:(NSURL *)fileURL role:(NSString *)role;
Modified: trunk/bibdesk/BDSKTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTemplate.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTemplate.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -97,6 +97,8 @@
@implementation BDSKTemplate
+@dynamic templateFormat, fileExtension, documentType, mainPageString,
scriptPath, mainPageTemplateURL, defaultItemTemplateURL, accessoryFileURLs,
scriptURL, representedFileURL;
+
static NSArray *exportTemplateTree = nil;
static NSArray *serviceTemplateTree = nil;
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.h
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.h 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.h 2019-07-14 16:59:32 UTC (rev
24022)
@@ -57,9 +57,9 @@
- (id)initWithObject:(id)anObject publications:(NSArray *)items
publicationsContext:(NSArray *)itemsContext template:(BDSKTemplate *)aTemplate;
-- (NSArray *)publications;
-- (id)publicationsUsingTemplate;
+@property (nonatomic, readonly) NSArray *publications;
+@property (nonatomic, readonly) id publicationsUsingTemplate;
-- (NSDate *)currentDate;
+@property (nonatomic, readonly) NSDate *currentDate;
@end
Modified: trunk/bibdesk/BDSKTemplateObjectProxy.m
===================================================================
--- trunk/bibdesk/BDSKTemplateObjectProxy.m 2019-07-14 09:43:43 UTC (rev
24021)
+++ trunk/bibdesk/BDSKTemplateObjectProxy.m 2019-07-14 16:59:32 UTC (rev
24022)
@@ -45,6 +45,8 @@
@implementation BDSKTemplateObjectProxy
+@dynamic publications, publicationsUsingTemplate, currentDate;
+
+ (NSString *)stringByParsingTemplate:(BDSKTemplate *)template
withObject:(id)anObject publications:(NSArray *)items {
return [self stringByParsingTemplate:template withObject:anObject
publications:items publicationsContext:nil];
}
Modified: trunk/bibdesk/BDSKTemplateTag.h
===================================================================
--- trunk/bibdesk/BDSKTemplateTag.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTemplateTag.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -61,7 +61,7 @@
@interface BDSKTemplateTag : NSObject
-- (BDSKTemplateTagType)type;
+@property (nonatomic, readonly) BDSKTemplateTagType type;
@end
@@ -73,7 +73,7 @@
- (id)initWithKeyPath:(NSString *)aKeyPath;
-- (NSString *)keyPath;
+@property (nonatomic, readonly) NSString *keyPath;
@end
@@ -86,9 +86,9 @@
- (id)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes;
-- (NSDictionary *)attributes;
+@property (nonatomic, readonly) NSDictionary *attributes;
-- (BDSKAttributeTemplate *)linkTemplate;
+@property (nonatomic, readonly) BDSKAttributeTemplate *linkTemplate;
@end
@@ -103,8 +103,8 @@
- (id)initWithKeyPath:(NSString *)aKeyPath itemTemplateString:(NSString
*)anItemTemplateString separatorTemplateString:(NSString
*)aSeparatorTemplateString;
-- (NSArray *)itemTemplate;
-- (NSArray *)separatorTemplate;
+@property (nonatomic, readonly) NSArray *itemTemplate;
+@property (nonatomic, readonly) NSArray *separatorTemplate;
@end
@@ -119,8 +119,8 @@
- (id)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString;
-- (NSArray *)itemTemplate;
-- (NSArray *)separatorTemplate;
+@property (nonatomic, readonly) NSArray *itemTemplate;
+@property (nonatomic, readonly) NSArray *separatorTemplate;
@end
@@ -134,8 +134,9 @@
- (id)initWithKeyPath:(NSString *)aKeyPath
matchType:(BDSKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates;
-- (BDSKTemplateTagMatchType)matchType;
-- (NSArray *)matchStrings;
+@property (nonatomic, readonly) BDSKTemplateTagMatchType matchType;
+@property (nonatomic, readonly) NSArray *matchStrings;
+
- (NSUInteger)countOfSubtemplates;
- (NSArray *)objectInSubtemplatesAtIndex:(NSUInteger)anIndex;
@@ -154,8 +155,7 @@
- (id)initWithText:(NSString *)aText;
-- (NSString *)text;
-- (void)setText:(NSString *)newText;
+@property (nonatomic, retain) NSString *text;
- (void)appendText:(NSString *)newText;
@@ -170,10 +170,9 @@
- (id)initWithAttributedText:(NSAttributedString *)anAttributedText;
-- (NSAttributedString *)attributedText;
-- (void)setAttributedText:(NSAttributedString *)newAttributedText;
+@property (nonatomic, retain) NSAttributedString *attributedText;
-- (NSArray *)linkTemplates;
+@property (nonatomic, readonly) NSArray *linkTemplates;
- (void)appendAttributedText:(NSAttributedString *)newAttributedText;
@@ -189,10 +188,10 @@
- (id)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass;
-- (NSArray *)template;
+@property (nonatomic, readonly) NSArray *template;
-- (NSRange)range;
+@property (nonatomic, readonly) NSRange range;
-- (Class)attributeClass;
+@property (nonatomic, readonly) Class attributeClass;
@end
Modified: trunk/bibdesk/BDSKTemplateTag.m
===================================================================
--- trunk/bibdesk/BDSKTemplateTag.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTemplateTag.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -69,7 +69,11 @@
@implementation BDSKTemplateTag
+
+@dynamic type;
+
- (BDSKTemplateTagType)type { return -1; }
+
@end
#pragma mark -
@@ -76,6 +80,8 @@
@implementation BDSKValueTemplateTag
+@synthesize keyPath;
+
- (id)initWithKeyPath:(NSString *)aKeyPath {
self = [super init];
if (self)
@@ -90,10 +96,6 @@
- (BDSKTemplateTagType)type { return BDSKTemplateTagValue; }
-- (NSString *)keyPath {
- return keyPath;
-}
-
@end
#pragma mark -
@@ -100,6 +102,9 @@
@implementation BDSKRichValueTemplateTag
+@synthesize attributes;
+@dynamic linkTemplate;
+
- (id)initWithKeyPath:(NSString *)aKeyPath attributes:(NSDictionary
*)anAttributes {
self = [super initWithKeyPath:aKeyPath];
if (self) {
@@ -114,10 +119,6 @@
[super dealloc];
}
-- (NSDictionary *)attributes {
- return attributes;
-}
-
- (BDSKAttributeTemplate *)linkTemplate {
if (linkTemplate == nil)
linkTemplate = copyTemplateForLink([attributes
objectForKey:NSLinkAttributeName], NSMakeRange(0, 0)) ?:
[[BDSKAttributeTemplate alloc] init];
@@ -130,6 +131,8 @@
@implementation BDSKCollectionTemplateTag
+@dynamic itemTemplate, separatorTemplate;
+
- (id)initWithKeyPath:(NSString *)aKeyPath itemTemplateString:(NSString
*)anItemTemplateString separatorTemplateString:(NSString
*)aSeparatorTemplateString {
self = [super initWithKeyPath:aKeyPath];
if (self) {
@@ -169,6 +172,8 @@
@implementation BDSKRichCollectionTemplateTag
+@dynamic itemTemplate, separatorTemplate;
+
- (id)initWithKeyPath:(NSString *)aKeyPath
itemTemplateAttributedString:(NSAttributedString
*)anItemTemplateAttributedString
separatorTemplateAttributedString:(NSAttributedString
*)aSeparatorTemplateAttributedString {
self = [super initWithKeyPath:aKeyPath];
if (self) {
@@ -208,6 +213,8 @@
@implementation BDSKConditionTemplateTag
+@synthesize matchType, matchStrings;
+
- (id)initWithKeyPath:(NSString *)aKeyPath
matchType:(BDSKTemplateTagMatchType)aMatchType matchStrings:(NSArray
*)aMatchStrings subtemplates:(NSArray *)aSubtemplates {
self = [super initWithKeyPath:aKeyPath];
if (self) {
@@ -226,14 +233,6 @@
- (BDSKTemplateTagType)type { return BDSKTemplateTagCondition; }
-- (BDSKTemplateTagMatchType)matchType {
- return matchType;
-}
-
-- (NSArray *)matchStrings {
- return matchStrings;
-}
-
- (NSUInteger)countOfSubtemplates {
return [subtemplates count];
}
@@ -268,6 +267,8 @@
@implementation BDSKTextTemplateTag
+@synthesize text;
+
- (id)initWithText:(NSString *)aText {
self = [super init];
if (self) {
@@ -283,17 +284,6 @@
- (BDSKTemplateTagType)type { return BDSKTemplateTagText; }
-- (NSString *)text {
- return text;
-}
-
-- (void)setText:(NSString *)newText {
- if (text != newText) {
- [text release];
- text = [newText retain];
- }
-}
-
- (void)appendText:(NSString *)newText {
[self setText:[text stringByAppendingString:newText]];
}
@@ -304,6 +294,9 @@
@implementation BDSKRichTextTemplateTag
+@synthesize attributedText;
+@dynamic linkTemplates;
+
- (id)initWithAttributedText:(NSAttributedString *)anAttributedText {
self = [super init];
if (self) {
@@ -320,17 +313,6 @@
- (BDSKTemplateTagType)type { return BDSKTemplateTagText; }
-- (NSAttributedString *)attributedText {
- return attributedText;
-}
-
-- (void)setAttributedText:(NSAttributedString *)newAttributedText {
- if (attributedText != newAttributedText) {
- [attributedText release];
- attributedText = [newAttributedText retain];
- }
-}
-
- (void)appendAttributedText:(NSAttributedString *)newAttributedText {
NSMutableAttributedString *newAttrText = [attributedText mutableCopy];
[newAttrText appendAttributedString:newAttributedText];
@@ -351,6 +333,8 @@
@implementation BDSKAttributeTemplate
+@synthesize template, range, attributeClass;
+
- (id)initWithTemplate:(NSArray *)aTemplate range:(NSRange)aRange
attributeClass:(Class)aClass {
self = [super init];
if (self) {
@@ -370,16 +354,4 @@
[super dealloc];
}
-- (NSRange)range {
- return range;
-}
-
-- (NSArray *)template {
- return template;
-}
-
-- (Class)attributeClass {
- return attributeClass;
-}
-
@end
Modified: trunk/bibdesk/BDSKToken.h
===================================================================
--- trunk/bibdesk/BDSKToken.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKToken.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -62,26 +62,20 @@
- (id)initWithTitle:(NSString *)aTitle;
-- (BDSKTokenType)type;
+@property (nonatomic, readonly) BDSKTokenType type;
-- (NSString *)title;
+@property (nonatomic, readonly) NSString *title;
-- (NSString *)fontName;
-- (void)setFontName:(NSString *)newFontName;
+@property (nonatomic, retain) NSString *fontName;
+@property (nonatomic) CGFloat fontSize;
+@property (nonatomic) NSInteger bold;
+@property (nonatomic) NSInteger italic;
-- (CGFloat)fontSize;
-- (void)setFontSize:(CGFloat)newFontSize;
+@property (nonatomic, readonly) NSString *string;
-- (NSInteger)bold;
-- (void)setBold:(NSInteger)newBold;
-
-- (NSInteger)italic;
-- (void)setItalic:(NSInteger)newItalic;
-
-- (NSString *)string;
- (NSAttributedString *)attributedStringWithDefaultAttributes:(NSDictionary
*)attributes;
-- (NSSet *)keysForValuesToObserveForUndo;
+@property (nonatomic, readonly) NSSet *keysForValuesToObserveForUndo;
- (void)setKey:(NSString *)aKey toValue:(id)aValue;
@@ -93,10 +87,9 @@
NSString *key;
}
-- (NSString *)key;
-- (void)setKey:(NSString *)newKey;
+@property (nonatomic, retain) NSString *key;
-- (NSArray *)keys;
+@property (nonatomic, readonly) NSArray *keys;
@end
@@ -108,15 +101,10 @@
NSString *suffix;
}
-- (NSString *)appendingKey;
-- (void)setAppendingKey:(NSString *)newAppendingKey;
+@property (nonatomic, retain) NSString *appendingKey;
+@property (nonatomic, retain) NSString *prefix;
+@property (nonatomic, retain) NSString *suffix;
-- (NSString *)prefix;
-- (void)setPrefix:(NSString *)newPrefix;
-
-- (NSString *)suffix;
-- (void)setSuffix:(NSString *)newSuffix;
-
@end
#pragma mark -
@@ -126,12 +114,9 @@
NSString *cleaningKey;
}
-- (NSString *)casingKey;
-- (void)setCasingKey:(NSString *)newCasingKey;
+@property (nonatomic, retain) NSString *casingKey;
+@property (nonatomic, retain) NSString *cleaningKey;
-- (NSString *)cleaningKey;
-- (void)setCleaningKey:(NSString *)newCleaningKey;
-
@end
#pragma mark -
@@ -140,8 +125,7 @@
NSString *urlFormatKey;
}
-- (NSString *)urlFormatKey;
-- (void)setUrlFormatKey:(NSString *)newUrlFormatKey;
+@property (nonatomic, retain) NSString *urlFormatKey;
@end
@@ -152,12 +136,9 @@
NSString *joinStyleKey;
}
-- (NSString *)nameStyleKey;
-- (void)setNameStyleKey:(NSString *)newNameStyleKey;
+@property (nonatomic, retain) NSString *nameStyleKey;
+@property (nonatomic, retain) NSString *joinStyleKey;
-- (NSString *)joinStyleKey;
-- (void)setJoinStyleKey:(NSString *)newJoinStyleKey;
-
@end
#pragma mark -
@@ -167,12 +148,9 @@
NSString *linkedFileJoinStyleKey;
}
-- (NSString *)linkedFileFormatKey;
-- (void)setLinkedFileFormatKey:(NSString *)newLinkedFileFormatKey;
+@property (nonatomic, retain) NSString *linkedFileFormatKey;
+@property (nonatomic, retain) NSString *linkedFileJoinStyleKey;
-- (NSString *)linkedFileJoinStyleKey;
-- (void)setLinkedFileJoinStyleKey:(NSString *)newLinkedFileJoinStyleKey;
-
@end
#pragma mark -
@@ -181,8 +159,7 @@
NSString *dateFormatKey;
}
-- (NSString *)dateFormatKey;
-- (void)setDateFormatKey:(NSString *)newDateFormatKey;
+@property (nonatomic, retain) NSString *dateFormatKey;
@end
@@ -193,12 +170,9 @@
NSString *counterCasingKey;
}
-- (NSString *)counterStyleKey;
-- (void)setCounterStyleKey:(NSString *)newCounterStyleKey;
+@property (nonatomic, retain) NSString *counterStyleKey;
+@property (nonatomic, retain) NSString *counterCasingKey;
-- (NSString *)counterCasingKey;
-- (void)setCounterCasingKey:(NSString *)newCounterCasingKey;
-
@end
#pragma mark -
@@ -208,12 +182,8 @@
NSString *altText;
}
-- (void)setTitle:(NSString *)newTitle;
+@property (nonatomic, retain) NSString *title;
+@property (nonatomic, retain) NSString *field;
+@property (nonatomic, retain) NSString *altText;
-- (NSString *)field;
-- (void)setField:(NSString *)newField;
-
-- (NSString *)altText;
-- (void)setAltText:(NSString *)newAltText;
-
@end
Modified: trunk/bibdesk/BDSKToken.m
===================================================================
--- trunk/bibdesk/BDSKToken.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKToken.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -72,6 +72,9 @@
@implementation BDSKToken
+@synthesize title, fontName, fontSize, bold, italic;
+@dynamic type, string, keysForValuesToObserveForUndo;
+
+ (id)tokenWithField:(NSString *)field {
id tag = nil;
if ([field isPersonField]) {
@@ -180,51 +183,6 @@
return -1;
}
-- (NSString *)title {
- return title;
-}
-
-- (NSString *)fontName {
- return fontName;
-}
-
-- (void)setFontName:(NSString *)newFontName {
- if (fontName != newFontName) {
- [fontName release];
- fontName = [newFontName retain];
- }
-}
-
-- (CGFloat)fontSize {
- return fontSize;
-}
-
-- (void)setFontSize:(CGFloat)newFontSize {
- if (fabs(fontSize - newFontSize) > 0.0) {
- fontSize = newFontSize;
- }
-}
-
-- (NSInteger)bold {
- return bold;
-}
-
-- (void)setBold:(NSInteger)newBold {
- if (bold != newBold) {
- bold = newBold;
- }
-}
-
-- (NSInteger)italic {
- return italic;
-}
-
-- (void)setItalic:(NSInteger)newItalic {
- if (italic != newItalic) {
- italic = newItalic;
- }
-}
-
- (NSString *)string {
return nil;
}
@@ -277,6 +235,9 @@
@implementation BDSKTagToken
+@synthesize key;
+@dynamic keys;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -320,17 +281,6 @@
return hash;
}
-- (NSString *)key {
- return key;
-}
-
-- (void)setKey:(NSString *)newKey {
- if (key != newKey) {
- [key release];
- key = [newKey retain];
- }
-}
-
- (NSArray *)keys {
if (key)
return [NSArray arrayWithObjects:key, nil];
@@ -359,6 +309,8 @@
@implementation BDSKValueTagToken
+@synthesize appendingKey, prefix, suffix;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -416,39 +368,6 @@
return hash;
}
-- (NSString *)appendingKey {
- return appendingKey;
-}
-
-- (void)setAppendingKey:(NSString *)newAppendingKey {
- if (appendingKey != newAppendingKey) {
- [appendingKey release];
- appendingKey = [newAppendingKey retain];
- }
-}
-
-- (NSString *)prefix {
- return prefix;
-}
-
-- (void)setPrefix:(NSString *)newPrefix {
- if (prefix != newPrefix) {
- [prefix release];
- prefix = [newPrefix retain];
- }
-}
-
-- (NSString *)suffix {
- return suffix;
-}
-
-- (void)setSuffix:(NSString *)newSuffix {
- if (suffix != newSuffix) {
- [suffix release];
- suffix = [newSuffix retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -504,6 +423,8 @@
@implementation BDSKFieldTagToken
+@synthesize casingKey, cleaningKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -558,28 +479,6 @@
return BDSKTokenTypeField;
}
-- (NSString *)casingKey {
- return casingKey;
-}
-
-- (void)setCasingKey:(NSString *)newCasingKey {
- if (casingKey != newCasingKey) {
- [casingKey release];
- casingKey = [newCasingKey retain];
- }
-}
-
-- (NSString *)cleaningKey {
- return cleaningKey;
-}
-
-- (void)setCleaningKey:(NSString *)newCleaningKey {
- if (cleaningKey != newCleaningKey) {
- [cleaningKey release];
- cleaningKey = [newCleaningKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -638,6 +537,8 @@
@implementation BDSKURLTagToken
+@synthesize urlFormatKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -685,17 +586,6 @@
return BDSKTokenTypeURL;
}
-- (NSString *)urlFormatKey {
- return urlFormatKey;
-}
-
-- (void)setUrlFormatKey:(NSString *)newUrlFormatKey {
- if (urlFormatKey != newUrlFormatKey) {
- [urlFormatKey release];
- urlFormatKey = [newUrlFormatKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -733,6 +623,8 @@
@implementation BDSKPersonTagToken
+@synthesize nameStyleKey, joinStyleKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -787,28 +679,6 @@
return BDSKTokenTypePerson;
}
-- (NSString *)nameStyleKey {
- return [[nameStyleKey retain] autorelease];
-}
-
-- (void)setNameStyleKey:(NSString *)newNameStyleKey {
- if (nameStyleKey != newNameStyleKey) {
- [nameStyleKey release];
- nameStyleKey = [newNameStyleKey retain];
- }
-}
-
-- (NSString *)joinStyleKey {
- return [[joinStyleKey retain] autorelease];
-}
-
-- (void)setJoinStyleKey:(NSString *)newJoinStyleKey {
- if (joinStyleKey != newJoinStyleKey) {
- [joinStyleKey release];
- joinStyleKey = [newJoinStyleKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -848,6 +718,8 @@
@implementation BDSKLinkedFileTagToken
+@synthesize linkedFileFormatKey, linkedFileJoinStyleKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -902,29 +774,6 @@
return BDSKTokenTypeLinkedFile;
}
-
-- (NSString *)linkedFileFormatKey {
- return [[linkedFileFormatKey retain] autorelease];
-}
-
-- (void)setLinkedFileFormatKey:(NSString *)newLinkedFileFormatKey {
- if (linkedFileFormatKey != newLinkedFileFormatKey) {
- [linkedFileFormatKey release];
- linkedFileFormatKey = [newLinkedFileFormatKey retain];
- }
-}
-
-- (NSString *)linkedFileJoinStyleKey {
- return [[linkedFileJoinStyleKey retain] autorelease];
-}
-
-- (void)setLinkedFileJoinStyleKey:(NSString *)newLinkedFileJoinStyleKey {
- if (linkedFileJoinStyleKey != newLinkedFileJoinStyleKey) {
- [linkedFileJoinStyleKey release];
- linkedFileJoinStyleKey = [newLinkedFileJoinStyleKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -961,6 +810,8 @@
@implementation BDSKDateTagToken
+@synthesize dateFormatKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -1008,17 +859,6 @@
return BDSKTokenTypeDate;
}
-- (NSString *)dateFormatKey {
- return dateFormatKey;
-}
-
-- (void)setDateFormatKey:(NSString *)newDateFormatKey {
- if (dateFormatKey != newDateFormatKey) {
- [dateFormatKey release];
- dateFormatKey = [newDateFormatKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -1056,6 +896,8 @@
@implementation BDSKNumberTagToken
+@synthesize counterStyleKey, counterCasingKey;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -1110,28 +952,6 @@
return BDSKTokenTypeNumber;
}
-- (NSString *)counterStyleKey {
- return counterStyleKey;
-}
-
-- (void)setCounterStyleKey:(NSString *)newCounterStyleKey {
- if (counterStyleKey != newCounterStyleKey) {
- [counterStyleKey release];
- counterStyleKey = [newCounterStyleKey retain];
- }
-}
-
-- (NSString *)counterCasingKey {
- return counterCasingKey;
-}
-
-- (void)setCounterCasingKey:(NSString *)newCounterCasingKey {
- if (counterCasingKey != newCounterCasingKey) {
- [counterCasingKey release];
- counterCasingKey = [newCounterCasingKey retain];
- }
-}
-
- (NSArray *)keys {
NSMutableArray *keys = [NSMutableArray array];
@@ -1170,6 +990,9 @@
@implementation BDSKTextToken
+@dynamic title;
+@synthesize field, altText;
+
- (id)initWithTitle:(NSString *)aTitle {
self = [super initWithTitle:aTitle];
if (self) {
@@ -1224,6 +1047,10 @@
return BDSKTokenTypeText;
}
+- (NSString *)title {
+ return title;
+}
+
- (void)setTitle:(NSString *)newTitle {
if (newTitle == nil)
newTitle = @"";
@@ -1233,28 +1060,6 @@
}
}
-- (NSString *)field {
- return field;
-}
-
-- (void)setField:(NSString *)newField {
- if (field != newField) {
- [field release];
- field = [newField retain];
- }
-}
-
-- (NSString *)altText {
- return altText;
-}
-
-- (void)setAltText:(NSString *)newAltText {
- if (altText != newAltText) {
- [altText release];
- altText = [newAltText retain];
- }
-}
-
- (NSString *)string {
if ([field length]) {
NSMutableString *string = [NSMutableString
stringWithFormat:@"<$%@?>%@", field, title];
Modified: trunk/bibdesk/BDSKTreeNode.h
===================================================================
--- trunk/bibdesk/BDSKTreeNode.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTreeNode.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -56,9 +56,8 @@
- (void)insertObject:(id)obj inChildrenAtIndex:(NSUInteger)anIndex;
- (void)removeObjectFromChildrenAtIndex:(NSUInteger)anIndex;
-- (BDSKTreeNode *)parent;
-- (void)setParent:(BDSKTreeNode *)aParent;
+@property (nonatomic, assign) BDSKTreeNode *parent;
-- (BOOL)isLeaf;
+@property (nonatomic, readonly, getter=isLeaf) BOOL leaf;
@end
Modified: trunk/bibdesk/BDSKTreeNode.m
===================================================================
--- trunk/bibdesk/BDSKTreeNode.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTreeNode.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -41,6 +41,9 @@
@implementation BDSKTreeNode
+@synthesize parent;
+@dynamic leaf;
+
- (id)initWithColumnValues:(NSDictionary *)newColumnValues children:(NSArray
*)newChildren;
{
if(self = [super init]){
@@ -110,13 +113,6 @@
return [columnValues hash] + 31 * [children hash];
}
-- (BDSKTreeNode *)parent { return parent; }
-
-- (void)setParent:(BDSKTreeNode *)anObject;
-{
- parent = anObject;
-}
-
- (id)valueForUndefinedKey:(NSString *)key {
return [columnValues valueForKey:key];
}
Modified: trunk/bibdesk/BDSKTypeTemplate.h
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTypeTemplate.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -51,24 +51,21 @@
- (id)initWithPubType:(NSString *)aPubType requiredTokens:(NSArray *)required
optionalTokens:(NSArray *)optional;
-- (NSString *)pubType;
-- (void)setPubType:(NSString *)newPubType;
+@property (nonatomic, retain) NSString *pubType;
-- (BOOL)isIncluded;
-- (void)setIncluded:(BOOL)newIncluded;
+@property (nonatomic, getter=isIncluded) BOOL included;
- (BOOL)isDefault;
- (void)setDefault:(BOOL)newDefault;
-- (NSColor *)textColor;
+@property (nonatomic, readonly) NSColor *textColor;
-- (NSArray *)requiredTokens;
-- (NSArray *)optionalTokens;
+@property (nonatomic, readonly) NSArray *requiredTokens;
+@property (nonatomic, readonly) NSArray *optionalTokens;
-- (NSArray *)itemTemplate;
-- (void)setItemTemplate:(NSArray *)newItemTemplate;
+@property (nonatomic, retain) NSArray *itemTemplate;
-- (NSString *)string;
+@property (nonatomic, readonly) NSString *string;
- (NSAttributedString *)attributedStringWithDefaultAttributes:(NSDictionary
*)attributes;
@end
Modified: trunk/bibdesk/BDSKTypeTemplate.m
===================================================================
--- trunk/bibdesk/BDSKTypeTemplate.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKTypeTemplate.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -45,6 +45,9 @@
@implementation BDSKTypeTemplate
+@synthesize pubType, included, requiredTokens, optionalTokens, itemTemplate;
+@dynamic textColor, string;
+
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
if ([key isEqualToString:@"textColor"])
@@ -73,25 +76,6 @@
#pragma mark Accessors
-- (NSString *)pubType {
- return pubType;
-}
-
-- (void)setPubType:(NSString *)newPubType {
- if (pubType != newPubType) {
- [pubType release];
- pubType = [newPubType retain];
- }
-}
-
-- (BOOL)isIncluded {
- return included;
-}
-
-- (void)setIncluded:(BOOL)newIncluded {
- included = newIncluded;
-}
-
- (BOOL)isDefault {
return isDefault;
}
@@ -111,18 +95,6 @@
return color;
}
-- (NSArray *)requiredTokens {
- return requiredTokens;
-}
-
-- (NSArray *)optionalTokens {
- return optionalTokens;
-}
-
-- (NSArray *)itemTemplate {
- return itemTemplate;
-}
-
- (void)setItemTemplate:(NSArray *)newItemTemplate {
if (itemTemplate != newItemTemplate) {
[itemTemplate release];
Modified: trunk/bibdesk/BDSKVersionNumber.h
===================================================================
--- trunk/bibdesk/BDSKVersionNumber.h 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKVersionNumber.h 2019-07-14 16:59:32 UTC (rev 24022)
@@ -62,13 +62,13 @@
- (id)initWithVersionString:(NSString *)versionString;
-- (NSString *)originalVersionString;
-- (NSString *)cleanVersionString;
+@property (nonatomic, readonly) NSString *originalVersionString;
+@property (nonatomic, readonly) NSString *cleanVersionString;
-- (NSUInteger)componentCount;
+@property (nonatomic, readonly) NSUInteger componentCount;
- (NSInteger)componentAtIndex:(NSUInteger)componentIndex;
-- (BDSKVersionType)releaseType;
+@property (nonatomic, readonly) BDSKVersionType releaseType;
- (NSComparisonResult)compare:(BDSKVersionNumber *)otherVersion;
Modified: trunk/bibdesk/BDSKVersionNumber.m
===================================================================
--- trunk/bibdesk/BDSKVersionNumber.m 2019-07-14 09:43:43 UTC (rev 24021)
+++ trunk/bibdesk/BDSKVersionNumber.m 2019-07-14 16:59:32 UTC (rev 24022)
@@ -56,6 +56,8 @@
@implementation BDSKVersionNumber
+@synthesize originalVersionString, cleanVersionString, componentCount,
releaseType;
+
// This allows version numbers like "1.3", "v1.3", "1.0b2", "1.0rc1", "198f3",
"1.0-alpha-5", and ignores spaces
+ (NSComparisonResult)compareVersionString:(NSString *)versionString
toVersionString:(NSString *)otherVersionString;
@@ -181,21 +183,6 @@
#pragma mark API
-- (NSString *)originalVersionString;
-{
- return originalVersionString;
-}
-
-- (NSString *)cleanVersionString;
-{
- return cleanVersionString;
-}
-
-- (NSUInteger)componentCount;
-{
- return componentCount;
-}
-
- (NSInteger)componentAtIndex:(NSUInteger)componentIndex;
{
// This treats the version as a infinite sequence ending in "...0.0.0.0",
making comparison easier
@@ -204,11 +191,6 @@
return 0;
}
-- (BDSKVersionType)releaseType;
-{
- return releaseType;
-}
-
#pragma mark NSCopying
- (id)copyWithZone:(NSZone *)zone;
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
