Revision: 24030
http://sourceforge.net/p/bibdesk/svn/24030
Author: hofman
Date: 2019-07-15 21:00:10 +0000 (Mon, 15 Jul 2019)
Log Message:
-----------
use properties for document class
Modified Paths:
--------------
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2019-07-15 17:50:47 UTC (rev 24029)
+++ trunk/bibdesk/BibDocument.h 2019-07-15 21:00:10 UTC (rev 24030)
@@ -269,18 +269,8 @@
NSString *uniqueID;
}
-/*!
-@method init
- @abstract initializer
- @discussion Sets up initial values. Note that this is called before IBOutlet
ivars are connected.
- If you need to set up initial values for those, use awakeFromNib instead.
- @result A BibDocument, or nil if some serious problem is encountered.
- */
-- (id)init;
+@property (nonatomic, readonly) BOOL isMainDocument;
-- (NSDictionary *)saveWindowSetupInExtendedAttributesAtURL:(NSURL *)anURL
forEncoding:(NSStringEncoding)encoding;
-- (NSDictionary *)mainWindowSetupDictionaryFromExtendedAttributes;
-- (BOOL)isMainDocument;
- (BOOL)commitPendingEdits;
- (BOOL)writeArchiveToURL:(NSURL *)fileURL error:(NSError **)outError;
@@ -288,10 +278,10 @@
- (NSData *)dataUsingTemplate:(BDSKTemplate *)template;
- (NSFileWrapper *)fileWrapperUsingTemplate:(BDSKTemplate *)template;
-- (NSData *)atomData;
-- (NSData *)MODSData;
-- (NSData *)endNoteData;
-- (NSData *)wordXMLData;
+@property (nonatomic, readonly) NSData *atomData;
+@property (nonatomic, readonly) NSData *MODSData;
+@property (nonatomic, readonly) NSData *endNoteData;
+@property (nonatomic, readonly) NSData *wordXMLData;
- (NSData *)bibTeXDataDroppingInternal:(BOOL)drop relativeToPath:(NSString
*)basePath error:(NSError **)outError;
- (NSData *)RISDataAndReturnError:(NSError **)error;
- (NSData *)LTBDataAndReturnError:(NSError **)error;
@@ -299,56 +289,16 @@
- (BOOL)readFromBibTeXData:(NSData *)data string:(NSString *)string
fromURL:(NSURL *)absoluteURL encoding:(NSStringEncoding)encoding error:(NSError
**)outError;
- (void)reportTemporaryCiteKeys:(NSString *)tmpKey
forNewDocument:(BOOL)isNewFile;
-
- (void)markAsImported;
-/*!
- @method bibTeXStringForPublications
- @abstract auxiliary method for generating bibtex string for publication
items
- @discussion generates appropriate bibtex string from the document's
current selection by calling bibTeXStringDroppingInternal:droppingInternal:.
-*/
- (NSString *)bibTeXStringForPublications:(NSArray *)items;
-
-/*!
- @method bibTeXStringDroppingInternal:forPublications:
- @abstract auxiliary method for generating bibtex string for publication
items
- @discussion generates appropriate bibtex string from given items.
-*/
- (NSString *)bibTeXStringDroppingInternal:(BOOL)drop forPublications:(NSArray
*)items;
-
-/*!
- @method previewBibTeXStringForPublications:
- @abstract auxiliary method for generating bibtex string for publication
items to use for generating RTF or PDF data
- @discussion generates appropriate bibtex string from given items.
-*/
- (NSString *)previewBibTeXStringForPublications:(NSArray *)items;
-/*!
- @method RISStringForPublications:
- @abstract auxiliary method for generating RIS string for publication
items
- @discussion generates appropriate RIS string from given items.
-*/
- (NSString *)RISStringForPublications:(NSArray *)items;
-
-/*!
- @method citeStringForPublications:citeString:
- @abstract method for generating cite string
- @discussion generates appropriate cite command from the given items
-*/
-
- (NSString *)citeStringForPublications:(NSArray *)items citeString:(NSString
*)citeString;
-/*!
- @method publications
- @abstract Returns the publications array.
- @discussion Returns the publications array.
-
-*/
-- (BDSKPublicationsArray *)publications;
-- (NSArray *)shownPublications;
-
-- (BDSKGroupsArray *)groups;
-
+@property (nonatomic, readonly) BDSKPublicationsArray *publications;
- (void)insertPublications:(NSArray *)pubs atIndexes:(NSIndexSet *)indexes;
- (void)addPublications:(NSArray *)pubArray;
- (void)addPublication:(BibItem *)pub;
@@ -356,20 +306,20 @@
- (void)removePublications:(NSArray *)pubs;
- (void)removePublication:(BibItem *)pub;
-- (NSDictionary *)documentInfo;
-- (void)setDocumentInfo:(NSDictionary *)dict;
+@property (nonatomic, readonly) NSArray *shownPublications;
+
+@property (nonatomic, readonly) BDSKGroupsArray *groups;
+
+@property (nonatomic, copy) NSDictionary *documentInfo;
- (NSString *)documentInfoForKey:(NSString *)key;
- (void)setDocumentInfo:(NSString *)value forKey:(NSString *)key;
- (id)valueForUndefinedKey:(NSString *)key;
- (NSString *)documentInfoString;
-- (BDSKItemSearchIndexes *)searchIndexes;
+@property (nonatomic, readonly) BDSKItemSearchIndexes *searchIndexes;
-#pragma mark bibtex macro support
+@property (nonatomic, readonly) BDSKMacroResolver *macroResolver;
-- (BDSKMacroResolver *)macroResolver;
-
-/* Paste related methods */
- (void)importPublications:(NSArray *)newPubs publicationsToAutoFile:(NSArray
*)pubsToAutoFile temporaryCiteKey:(NSString *)tmpCiteKey
options:(BDSKImportOptions)options;
- (void)importPublications:(NSArray *)newPubs
options:(BDSKImportOptions)options;
- (NSArray *)importPublicationsFromPasteboard:(NSPasteboard *)pb
options:(BDSKImportOptions)options;
@@ -378,57 +328,34 @@
// Private methods
-/*!
- @method sortPubsByKey:
- @abstract Sorts the publications table by the given key. Pass nil for
the table column to re-sort the previously sorted column with the same order.
- @discussion (comprehensive description)
- @param key (description)
-*/
+- (NSDictionary *)saveWindowSetupInExtendedAttributesAtURL:(NSURL *)anURL
forEncoding:(NSStringEncoding)encoding;
+@property (nonatomic, readonly) NSDictionary
*mainWindowSetupDictionaryFromExtendedAttributes;
+
- (void)sortPubsByKey:(NSString *)key;
-/*!
- @method numberOfSelectedPubs
- @abstract (description)
- @discussion (description)
- @result the number of currently selected pubs in the doc
-*/
-- (NSInteger)numberOfSelectedPubs;
-- (NSInteger)numberOfClickedOrSelectedPubs;
+@property (nonatomic, readonly) NSInteger numberOfSelectedPubs;
+@property (nonatomic, readonly) NSInteger numberOfClickedOrSelectedPubs;
-/*!
- @method selectedPublications
- @abstract (description)
- @discussion (description)
- @result an array of the currently selected pubs in the doc
-*/
-- (NSArray *)selectedPublications;
-- (NSArray *)clickedOrSelectedPublications;
+@property (nonatomic, readonly) NSArray *selectedPublications;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedPublications;
-- (BibItem *)singleSelectedPublication;
+@property (nonatomic, readonly) BibItem *singleSelectedPublication;
- (BOOL)selectItemsForCiteKeys:(NSArray *)citeKeys selectLibrary:(BOOL)flag;
- (BOOL)selectItemForPartialItem:(NSDictionary *)partialItem;
- (void)selectPublication:(BibItem *)bib;
-
- (void)selectPublications:(NSArray *)bibArray;
-- (NSArray *)selectedFileURLs;
-- (NSArray *)clickedOrSelectedFileURLs;
-- (NSArray *)selectedRemoteURLs;
-- (NSArray *)clickedOrSelectedRemoteURLs;
+@property (nonatomic, readonly) NSArray *selectedFileURLs;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedFileURLs;
+@property (nonatomic, readonly) NSArray *selectedRemoteURLs;
+@property (nonatomic, readonly) NSArray *clickedOrSelectedRemoteURLs;
- (NSArray *)selectedURLsForField:(NSString *)field;
- (NSArray *)clickedOrSelectedURLsForField:(NSString *)field;
-- (NSStringEncoding)documentStringEncoding;
-- (void)setDocumentStringEncoding:(NSStringEncoding)encoding;
+@property (nonatomic) NSStringEncoding documentStringEncoding;
-/*!
- @method userChangedField:ofPublications:from:to:
- @abstract Autofiles and generates citekey if we should and runs a script
hook
- @discussion (comprehensive description)
- @result Mask indicating what was autogenerated: 1 for autogenerating
cite key, 2 for autofile
-*/
- (NSInteger)userChangedField:(NSString *)fieldName ofPublications:(NSArray
*)pubs from:(NSArray *)oldValues to:(NSArray *)newValues;
- (NSInteger)userChangedField:(NSString *)fieldName ofPublication:(BibItem
*)pub from:(id)oldValue to:(id)newValue;
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2019-07-15 17:50:47 UTC (rev 24029)
+++ trunk/bibdesk/BibDocument.m 2019-07-15 21:00:10 UTC (rev 24030)
@@ -186,6 +186,9 @@
@implementation BibDocument
+@synthesize publications, shownPublications, groups, documentInfo,
searchIndexes, macroResolver, documentStringEncoding;
+@dynamic mainWindowSetupDictionaryFromExtendedAttributes, isMainDocument,
atomData, MODSData, endNoteData, wordXMLData, numberOfSelectedPubs,
numberOfClickedOrSelectedPubs, selectedPublications,
clickedOrSelectedPublications, singleSelectedPublication, selectedFileURLs,
clickedOrSelectedFileURLs, selectedRemoteURLs, clickedOrSelectedRemoteURLs;
+
+ (void)initialize {
BDSKINITIALIZE;
@@ -850,14 +853,6 @@
[fileSearchController resetWithPublications:newPubs];
}
-- (BDSKPublicationsArray *)publications{
- return publications;
-}
-
-- (NSArray *)shownPublications{
- return shownPublications;
-}
-
- (void)insertPublications:(NSArray *)pubs atIndexes:(NSIndexSet *)indexes{
// this assertion is only necessary to preserve file order for undo
NSParameterAssert([indexes count] == [pubs count]);
@@ -918,24 +913,8 @@
[self removePublicationsAtIndexes:[NSIndexSet
indexSetWithIndex:[publications indexOfObjectIdenticalTo:pub]]];
}
-#pragma mark Groups accessors
-
-- (BDSKGroupsArray *)groups{
- return groups;
-}
-
-#pragma mark Searching
-
-- (BDSKItemSearchIndexes *)searchIndexes{
- return searchIndexes;
-}
-
#pragma mark Document Info
-- (NSDictionary *)documentInfo{
- return documentInfo;
-}
-
- (void)setDocumentInfo:(NSDictionary *)dict{
if (dict != documentInfo) {
[[[self undoManager] prepareWithInvocationTarget:self]
setDocumentInfo:[[documentInfo copy] autorelease]];
@@ -965,12 +944,6 @@
return string;
}
-#pragma mark Macro stuff
-
-- (BDSKMacroResolver *)macroResolver{
- return macroResolver;
-}
-
#pragma mark -
#pragma mark Document Saving
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
