From: <ho...@us...> - 2006-08-05 17:15:22
|
Revision: 7237 Author: hofman Date: 2006-08-05 10:14:53 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/bibdesk/?rev=7237&view=rev Log Message: ----------- Use new category to create case insensitive key dictionaries. Modified Paths: -------------- trunk/bibdesk/BDSKDocumentInfoWindowController.m trunk/bibdesk/BDSKMacroResolver.m trunk/bibdesk/BibDocument.m trunk/bibdesk/NSMutableDictionary+ThreadSafety.h trunk/bibdesk/NSMutableDictionary+ThreadSafety.m Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.m =================================================================== --- trunk/bibdesk/BDSKDocumentInfoWindowController.m 2006-08-05 17:13:04 UTC (rev 7236) +++ trunk/bibdesk/BDSKDocumentInfoWindowController.m 2006-08-05 17:14:53 UTC (rev 7237) @@ -38,7 +38,7 @@ #import "BDSKDocumentInfoWindowController.h" #import "BibDocument.h" -#import "NSMutableDictionary+ThreadSafety.h" +#import "NSDictionary_BDSKExtensions.h" @implementation BDSKDocumentInfoWindowController @@ -77,7 +77,7 @@ - (void)resetInfo{ if (info == nil) - info = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + info = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; [info setDictionary:[document documentInfo]]; [self refreshKeys]; } Modified: trunk/bibdesk/BDSKMacroResolver.m =================================================================== --- trunk/bibdesk/BDSKMacroResolver.m 2006-08-05 17:13:04 UTC (rev 7236) +++ trunk/bibdesk/BDSKMacroResolver.m 2006-08-05 17:14:53 UTC (rev 7237) @@ -40,7 +40,7 @@ #import "BibPrefController.h" #import "BDSKComplexString.h" #import "BDSKStringNode.h" -#import "NSMutableDictionary+ThreadSafety.h" +#import "NSDictionary_BDSKExtensions.h" #import "BDSKConverter.h" #import "BibTeXParser.h" #import "BibDocument.h" @@ -282,7 +282,7 @@ // It is not quite correct because bibtex does discriminate, // but this is the best we can do. The OFCreateCaseInsensitiveKeyMutableDictionary() // is used to create a dictionary with case-insensitive keys. - macroDefinitions = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + macroDefinitions = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; } - (void)synchronize{} @@ -323,7 +323,7 @@ // we grab their localized versions for display. NSDictionary *standardDefs = [NSDictionary dictionaryWithObjects:[[NSUserDefaults standardUserDefaults] objectForKey:NSMonthNameArray] forKeys:[NSArray arrayWithObjects:@"jan", @"feb", @"mar", @"apr", @"may", @"jun", @"jul", @"aug", @"sep", @"oct", @"nov", @"dec", nil]]; - standardMacroDefinitions = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + standardMacroDefinitions = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; [standardMacroDefinitions addEntriesFromDictionary:standardDefs]; // these need to be loaded lazily, because loading them can use ourselves, but we aren't yet initialized fileMacroDefinitions = nil; @@ -346,7 +346,7 @@ - (void)loadMacroDefinitions{ OFPreferenceWrapper *pw = [OFPreferenceWrapper sharedPreferenceWrapper]; - macroDefinitions = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + macroDefinitions = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; // legacy, load old style prefs NSDictionary *oldMacros = [pw dictionaryForKey:BDSKBibStyleMacroDefinitionsKey]; @@ -374,7 +374,7 @@ NSEnumerator *fileE = [[pw stringArrayForKey:BDSKGlobalMacroFilesKey] objectEnumerator]; NSString *file; - fileMacroDefinitions = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + fileMacroDefinitions = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; while (file = [fileE nextObject]) { NSString *fileContent = [NSString stringWithContentsOfFile:file]; Modified: trunk/bibdesk/BibDocument.m =================================================================== --- trunk/bibdesk/BibDocument.m 2006-08-05 17:13:04 UTC (rev 7236) +++ trunk/bibdesk/BibDocument.m 2006-08-05 17:14:53 UTC (rev 7237) @@ -92,7 +92,7 @@ #import "NSTextView_BDSKExtensions.h" #import "NSTableView_BDSKExtensions.h" #import "BDSKWebOfScienceParser.h" -#import "NSMutableDictionary+ThreadSafety.h" +#import "NSDictionary_BDSKExtensions.h" #import "NSSet_BDSKExtensions.h" #import "NSFileManager_ExtendedAttributes.h" #import "PDFMetadata.h" @@ -133,7 +133,7 @@ frontMatter = [[NSMutableString alloc] initWithString:@""]; - documentInfo = (NSMutableDictionary *)BDSKCreateCaseInsensitiveKeyMutableDictionary(); + documentInfo = [[NSMutableDictionary alloc] initForCaseInsensitiveKeys]; currentGroupField = [[[OFPreferenceWrapper sharedPreferenceWrapper] objectForKey:BDSKCurrentGroupFieldKey] retain]; Modified: trunk/bibdesk/NSMutableDictionary+ThreadSafety.h =================================================================== --- trunk/bibdesk/NSMutableDictionary+ThreadSafety.h 2006-08-05 17:13:04 UTC (rev 7236) +++ trunk/bibdesk/NSMutableDictionary+ThreadSafety.h 2006-08-05 17:14:53 UTC (rev 7237) @@ -58,5 +58,3 @@ - (void)removeObjectsForKeys:(NSArray *)keys usingReadWriteLock:(id <OFReadWriteLocking>)aLock; @end - -extern NSMutableDictionary *BDSKCreateCaseInsensitiveKeyMutableDictionary(void); \ No newline at end of file Modified: trunk/bibdesk/NSMutableDictionary+ThreadSafety.m =================================================================== --- trunk/bibdesk/NSMutableDictionary+ThreadSafety.m 2006-08-05 17:13:04 UTC (rev 7236) +++ trunk/bibdesk/NSMutableDictionary+ThreadSafety.m 2006-08-05 17:14:53 UTC (rev 7237) @@ -157,10 +157,4 @@ [aLock unlockForWriting]; } -NSMutableDictionary *BDSKCreateCaseInsensitiveKeyMutableDictionary(void) -{ - return (NSMutableDictionary *)CFDictionaryCreateMutable(CFAllocatorGetDefault(), 0, &BDSKCaseInsensitiveStringKeyDictionaryCallBacks, &OFNSObjectDictionaryValueCallbacks); -} - - @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |