Menu
▾
▴
[Bibdesk-commit] SF.net SVN: bibdesk: [7261] trunk/bibdesk
|
From: <ho...@us...> - 2006-08-06 10:58:40
|
Revision: 7261 Author: hofman Date: 2006-08-06 03:58:29 -0700 (Sun, 06 Aug 2006) ViewCVS: http://svn.sourceforge.net/bibdesk/?rev=7261&view=rev Log Message: ----------- Rename some methods and an ivar to avoid confusion. Modified Paths: -------------- trunk/bibdesk/BDSKFormatParser.m trunk/bibdesk/BibDocument.m trunk/bibdesk/BibDocument_DataSource.m trunk/bibdesk/BibEditor.m trunk/bibdesk/BibItem.m trunk/bibdesk/BibTypeManager.h trunk/bibdesk/BibTypeManager.m Modified: trunk/bibdesk/BDSKFormatParser.m =================================================================== --- trunk/bibdesk/BDSKFormatParser.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BDSKFormatParser.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -325,7 +325,7 @@ break; case 'l': // old filename without extension - if ([[[BibTypeManager sharedManager] localURLFieldsSet] containsObject:fieldName]) + if ([[[BibTypeManager sharedManager] localFileFieldsSet] containsObject:fieldName]) string = [pub localFilePathForField:fieldName]; else string = [pub localFilePathForField:BDSKLocalUrlString]; @@ -337,7 +337,7 @@ break; case 'L': // old filename with extension - if ([[[BibTypeManager sharedManager] localURLFieldsSet] containsObject:fieldName]) + if ([[[BibTypeManager sharedManager] localFileFieldsSet] containsObject:fieldName]) string = [pub localFilePathForField:fieldName]; else string = [pub localFilePathForField:BDSKLocalUrlString]; @@ -349,7 +349,7 @@ break; case 'e': // old file extension - if ([[[BibTypeManager sharedManager] localURLFieldsSet] containsObject:fieldName]) + if ([[[BibTypeManager sharedManager] localFileFieldsSet] containsObject:fieldName]) string = [pub localFilePathForField:fieldName]; else string = [pub localFilePathForField:BDSKLocalUrlString]; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibDocument.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -1680,7 +1680,7 @@ if([tableView clickedColumn] != -1){ colID = [[[tableView tableColumns] objectAtIndex:[tableView clickedColumn]] identifier]; } - if([[BibTypeManager sharedManager] isLocalURLField:colID]){ + if([[BibTypeManager sharedManager] isLocalFileField:colID]){ [self openLinkedFileForField:colID]; }else if([[BibTypeManager sharedManager] isRemoteURLField:colID]){ [self openRemoteURLForField:colID]; @@ -2836,7 +2836,7 @@ NSURL *theURL; NSDictionary *representedObject; - if([[BibTypeManager sharedManager] isLocalURLField:tcId]){ + if([[BibTypeManager sharedManager] isLocalFileField:tcId]){ myMenu = [[fileMenu copyWithZone:[NSMenu menuZone]] autorelease]; [[myMenu itemAtIndex:0] setRepresentedObject:tcId]; [[myMenu itemAtIndex:1] setRepresentedObject:tcId]; Modified: trunk/bibdesk/BibDocument_DataSource.m =================================================================== --- trunk/bibdesk/BibDocument_DataSource.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibDocument_DataSource.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -497,7 +497,7 @@ dragColumnId = [[[tv tableColumns] objectAtIndex:dragColumn] identifier]; - if([[BibTypeManager sharedManager] isLocalURLField:dragColumnId]){ + if([[BibTypeManager sharedManager] isLocalFileField:dragColumnId]){ // if we have more than one row, we can't put file contents on the pasteboard, but most apps seem to handle file names just fine unsigned row = [rowIndexes firstIndex]; @@ -1206,7 +1206,7 @@ // this ivar stores the field name (e.g. Url, L2) NSString *fieldName = [self promiseDragColumnIdentifier]; - BOOL isLocalFile = [[BibTypeManager sharedManager] isLocalURLField:fieldName]; + BOOL isLocalFile = [[BibTypeManager sharedManager] isLocalFileField:fieldName]; NSString *originalPath; NSString *fileName; Modified: trunk/bibdesk/BibEditor.m =================================================================== --- trunk/bibdesk/BibEditor.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibEditor.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -1599,7 +1599,7 @@ - (void)recordChangingField:(NSString *)fieldName toValue:(NSString *)value{ NSString *oldValue = [[[theBib valueOfField:fieldName] copy] autorelease]; - BOOL isLocalFile = [[BibTypeManager sharedManager] isLocalURLField:fieldName]; + BOOL isLocalFile = [[BibTypeManager sharedManager] isLocalFileField:fieldName]; NSURL *oldURL = (isLocalFile) ? [[theBib URLForField:fieldName] fileURLByResolvingAliases] : nil; [theBib setField:fieldName toValue:value]; @@ -2106,7 +2106,7 @@ // we put webloc types first, as we always want to accept them for remote URLs, but never for local files dragType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil]]; - if ([[BibTypeManager sharedManager] isLocalURLField:field]) { + if ([[BibTypeManager sharedManager] isLocalFileField:field]) { if ([dragType isEqualToString:NSFilenamesPboardType]) { return YES; } else if ([dragType isEqualToString:NSURLPboardType]) { @@ -2141,7 +2141,7 @@ // we put webloc types first, as we always want to accept them for remote URLs, but never for local files dragType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:BDSKWeblocFilePboardType, NSFilenamesPboardType, NSURLPboardType, nil]]; - if ([[BibTypeManager sharedManager] isLocalURLField:field]) { + if ([[BibTypeManager sharedManager] isLocalFileField:field]) { // a file, we link the local file field NSURL *fileURL = nil; Modified: trunk/bibdesk/BibItem.m =================================================================== --- trunk/bibdesk/BibItem.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibItem.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -1281,7 +1281,7 @@ } - (NSDictionary *)searchIndexInfo{ - NSSet *urlFields = [[BibTypeManager sharedManager] localURLFieldsSet]; + NSSet *urlFields = [[BibTypeManager sharedManager] localFileFieldsSet]; NSEnumerator *fieldEnumerator = [urlFields objectEnumerator]; NSString *urlFieldName = nil; @@ -2054,7 +2054,7 @@ NSURL *url = [self URLForField:field]; - if([[BibTypeManager sharedManager] isLocalURLField:field] && (url = [url fileURLByResolvingAliases]) == nil) + if([[BibTypeManager sharedManager] isLocalFileField:field] && (url = [url fileURLByResolvingAliases]) == nil) return [NSImage missingFileImage]; return [NSImage imageForURL:url]; @@ -2067,14 +2067,14 @@ NSURL *url = [self URLForField:field]; - if([[BibTypeManager sharedManager] isLocalURLField:field] && (url = [url fileURLByResolvingAliases]) == nil) + if([[BibTypeManager sharedManager] isLocalFileField:field] && (url = [url fileURLByResolvingAliases]) == nil) return [NSImage smallMissingFileImage]; return [NSImage smallImageForURL:url]; } - (NSURL *)URLForField:(NSString *)field{ - if([[BibTypeManager sharedManager] isLocalURLField:field]){ + if([[BibTypeManager sharedManager] isLocalFileField:field]){ return [self localFileURLForField:field]; } else if([[BibTypeManager sharedManager] isRemoteURLField:field]) return [self remoteURLForField:field]; @@ -2670,7 +2670,7 @@ - (void)addPDFMetadataToFileForLocalURLField:(NSString *)field; { - NSParameterAssert([[BibTypeManager sharedManager] isLocalURLField:field]); + NSParameterAssert([[BibTypeManager sharedManager] isLocalFileField:field]); if([[OFPreferenceWrapper sharedPreferenceWrapper] boolForKey:BDSKShouldUsePDFMetadata] && floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_3){ NSError *error = nil; Modified: trunk/bibdesk/BibTypeManager.h =================================================================== --- trunk/bibdesk/BibTypeManager.h 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibTypeManager.h 2006-08-06 10:58:29 UTC (rev 7261) @@ -80,7 +80,7 @@ NSCharacterSet *invalidGeneralCharSet; NSCharacterSet *strictInvalidGeneralCharSet; - NSMutableSet *localURLFieldsSet; + NSMutableSet *localFileFieldsSet; NSMutableSet *remoteURLFieldsSet; NSMutableSet *allURLFieldsSet; NSMutableSet *ratingFieldsSet; @@ -126,8 +126,8 @@ - (BOOL)isURLField:(NSString *)field; - (BOOL)isRemoteURLField:(NSString *)field; -- (BOOL)isLocalURLField:(NSString *)field; -- (NSSet *)localURLFieldsSet; +- (BOOL)isLocalFileField:(NSString *)field; +- (NSSet *)localFileFieldsSet; - (NSSet *)allURLFieldsSet; - (NSSet *)noteFieldsSet; Modified: trunk/bibdesk/BibTypeManager.m =================================================================== --- trunk/bibdesk/BibTypeManager.m 2006-08-06 10:42:18 UTC (rev 7260) +++ trunk/bibdesk/BibTypeManager.m 2006-08-06 10:58:29 UTC (rev 7261) @@ -102,7 +102,7 @@ strictInvalidGeneralCharSet = [[NSCharacterSet alloc] init]; - localURLFieldsSet = [[NSMutableSet alloc] initWithCapacity:5]; + localFileFieldsSet = [[NSMutableSet alloc] initWithCapacity:5]; remoteURLFieldsSet = [[NSMutableSet alloc] initWithCapacity:5]; allURLFieldsSet = [[NSMutableSet alloc] initWithCapacity:10]; [self reloadURLFields]; @@ -146,7 +146,7 @@ [strictInvalidRemoteUrlCharSet release]; [invalidGeneralCharSet release]; [strictInvalidGeneralCharSet release]; - [localURLFieldsSet release]; + [localFileFieldsSet release]; [remoteURLFieldsSet release]; [allURLFieldsSet release]; [ratingFieldsSet release]; @@ -221,14 +221,14 @@ - (void)reloadURLFields { @synchronized(self){ - [localURLFieldsSet removeAllObjects]; + [localFileFieldsSet removeAllObjects]; [remoteURLFieldsSet removeAllObjects]; [allURLFieldsSet removeAllObjects]; - [localURLFieldsSet addObjectsFromArray:[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKLocalFileFieldsKey]]; + [localFileFieldsSet addObjectsFromArray:[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKLocalFileFieldsKey]]; [remoteURLFieldsSet addObjectsFromArray:[[OFPreferenceWrapper sharedPreferenceWrapper] stringArrayForKey:BDSKRemoteURLFieldsKey]]; [allURLFieldsSet unionSet:remoteURLFieldsSet]; - [allURLFieldsSet unionSet:localURLFieldsSet]; + [allURLFieldsSet unionSet:localFileFieldsSet]; } } @@ -483,10 +483,10 @@ return [remoteURLFieldsSet containsObject:field]; } -- (BOOL)isLocalURLField:(NSString *)field{ +- (BOOL)isLocalFileField:(NSString *)field{ BOOL rv; @synchronized(self){ - rv = [localURLFieldsSet containsObject:field]; + rv = [localFileFieldsSet containsObject:field]; } return rv; } @@ -500,10 +500,10 @@ } // this one needs to be thread safe -- (NSSet *)localURLFieldsSet{ +- (NSSet *)localFileFieldsSet{ NSSet *set; @synchronized(self){ - set = [[localURLFieldsSet copy] autorelease]; + set = [[localFileFieldsSet copy] autorelease]; } return set; } @@ -544,7 +544,7 @@ if( [fieldName isEqualToString:BDSKCiteKeyString]){ return invalidCiteKeyCharSet; } - if([self isLocalURLField:fieldName]){ + if([self isLocalFileField:fieldName]){ return invalidLocalUrlCharSet; } if([self isRemoteURLField:fieldName]){ @@ -557,7 +557,7 @@ if( [fieldName isEqualToString:BDSKCiteKeyString]){ return strictInvalidCiteKeyCharSet; } - if([self isLocalURLField:fieldName]){ + if([self isLocalFileField:fieldName]){ return strictInvalidLocalUrlCharSet; } if([self isRemoteURLField:fieldName]){ @@ -567,7 +567,7 @@ } - (NSCharacterSet *)veryStrictInvalidCharactersForField:(NSString *)fieldName inFileType:(NSString *)type{ - if([self isLocalURLField:fieldName]){ + if([self isLocalFileField:fieldName]){ return veryStrictInvalidLocalUrlCharSet; } return [self strictInvalidCharactersForField:fieldName inFileType:type]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |