Revision: 18471
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18471&view=rev
Author: hofman
Date: 2012-02-02 18:13:41 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Simplify method to create string with trial encoding, as we always pass YES as
the last parameter
Modified Paths:
--------------
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKImportCommand.m
trunk/bibdesk/BDSKMacroResolver.m
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKURLGroup.m
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/NSString_BDSKExtensions.h
trunk/bibdesk/NSString_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2012-02-02 15:27:19 UTC (rev 18470)
+++ trunk/bibdesk/BDSKErrorEditor.m 2012-02-02 18:13:41 UTC (rev 18471)
@@ -281,7 +281,7 @@
NSStringEncoding encoding = [manager documentStringEncoding];
if ([dfm fileExistsAtPath:fileName]) {
- NSString *fileStr = [[NSString alloc] initWithContentsOfFile:fileName
encoding:encoding guessEncoding:YES];
+ NSString *fileStr = [[NSString alloc] initWithContentsOfFile:fileName
guessedEncoding:encoding];
if(!fileStr)
fileStr = [[NSString alloc]
initWithString:NSLocalizedString(@"Unable to determine the correct character
encoding.", @"Message when unable to determine encoding for error editor")];
[textView setString:fileStr];
Modified: trunk/bibdesk/BDSKImportCommand.m
===================================================================
--- trunk/bibdesk/BDSKImportCommand.m 2012-02-02 15:27:19 UTC (rev 18470)
+++ trunk/bibdesk/BDSKImportCommand.m 2012-02-02 18:13:41 UTC (rev 18471)
@@ -112,7 +112,7 @@
if (string) {
// make sure we get the right thing
if ([string isKindOfClass:[NSURL class]]) {
- string = [NSString stringWithContentsOfFile:[string path]
encoding:0 guessEncoding:YES];
+ string = [NSString stringWithContentsOfFile:[string path]
guessedEncoding:0];
}
if ([string isKindOfClass:[NSString class]] == NO) {
[self setScriptErrorNumber:NSArgumentsWrongScriptError];
Modified: trunk/bibdesk/BDSKMacroResolver.m
===================================================================
--- trunk/bibdesk/BDSKMacroResolver.m 2012-02-02 15:27:19 UTC (rev 18470)
+++ trunk/bibdesk/BDSKMacroResolver.m 2012-02-02 18:13:41 UTC (rev 18471)
@@ -359,7 +359,7 @@
fileMacroDefinitions = [[NSMutableDictionary alloc]
initForCaseInsensitiveKeys];
for (NSString *file in [sud stringArrayForKey:BDSKGlobalMacroFilesKey]) {
- NSString *fileContent = [NSString stringWithContentsOfFile:file
encoding:0 guessEncoding:YES];
+ NSString *fileContent = [NSString stringWithContentsOfFile:file
guessedEncoding:0];
NSDictionary *macroDefs = nil;
if (fileContent == nil) continue;
if ([[file pathExtension] isCaseInsensitiveEqual:@"bib"])
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2012-02-02 15:27:19 UTC (rev
18470)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2012-02-02 18:13:41 UTC (rev
18471)
@@ -540,7 +540,7 @@
if ([fm fileExistsAtPath:file] == NO ||
([extension isCaseInsensitiveEqual:@"bib"] == NO && [extension
isCaseInsensitiveEqual:@"bst"] == NO))
continue;
- NSString *fileStr = [NSString stringWithContentsOfFile:file
encoding:0 guessEncoding:YES];
+ NSString *fileStr = [NSString stringWithContentsOfFile:file
guessedEncoding:0];
if (fileStr != nil)
success = success || [self addMacrosFromBibTeXString:fileStr];
}
Modified: trunk/bibdesk/BDSKURLGroup.m
===================================================================
--- trunk/bibdesk/BDSKURLGroup.m 2012-02-02 15:27:19 UTC (rev 18470)
+++ trunk/bibdesk/BDSKURLGroup.m 2012-02-02 18:13:41 UTC (rev 18471)
@@ -191,7 +191,7 @@
}
// tried using -[NSString stringWithContentsOfFile:usedEncoding:error:]
but it fails too often
- NSString *contentString = [NSString stringWithContentsOfFile:filePath
encoding:0 guessEncoding:YES];
+ NSString *contentString = [NSString stringWithContentsOfFile:filePath
guessedEncoding:0];
NSArray *pubs = nil;
NSDictionary *macros = nil;
if (nil == contentString) {
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2012-02-02 15:27:19 UTC (rev 18470)
+++ trunk/bibdesk/BibDocument.m 2012-02-02 18:13:41 UTC (rev 18471)
@@ -2217,7 +2217,7 @@
if ([unreadableTypes containsObject:[fileName pathExtension]] ==
NO) {
// try to create a string
- NSString *contentString = [[NSString alloc]
initWithContentsOfFile:fileName encoding:[self documentStringEncoding]
guessEncoding:YES];
+ NSString *contentString = [[NSString alloc]
initWithContentsOfFile:fileName guessedEncoding:[self documentStringEncoding]];
if (contentString != nil) {
if ([theUTI isEqualToUTI:@"org.tug.tex.bibtex"])
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2012-02-02 15:27:19 UTC (rev
18470)
+++ trunk/bibdesk/BibDocument_DataSource.m 2012-02-02 18:13:41 UTC (rev
18471)
@@ -710,7 +710,7 @@
}
- (BOOL)selectItemsInAuxFileAtPath:(NSString *)auxPath {
- NSString *auxString = [NSString stringWithContentsOfFile:auxPath
encoding:[self documentStringEncoding] guessEncoding:YES];
+ NSString *auxString = [NSString stringWithContentsOfFile:auxPath
guessedEncoding:[self documentStringEncoding]];
NSString *command = @"\\bibcite{"; // we used to get the command by
looking at the line after \bibdata, but that's unreliable as there can be other
stuff in between the \bibcite commands
if (auxString == nil)
@@ -1779,7 +1779,7 @@
if([readableTypes containsObject:[fileName pathExtension]])
return NO;
- NSString *contentString = [[NSString alloc]
initWithContentsOfFile:fileName encoding:NSUTF8StringEncoding
guessEncoding:YES];
+ NSString *contentString = [[NSString alloc]
initWithContentsOfFile:fileName guessedEncoding:NSUTF8StringEncoding];
if(contentString == nil)
return YES;
Modified: trunk/bibdesk/NSString_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.h 2012-02-02 15:27:19 UTC (rev
18470)
+++ trunk/bibdesk/NSString_BDSKExtensions.h 2012-02-02 18:13:41 UTC (rev
18471)
@@ -122,15 +122,14 @@
+ (NSString *)stringWithTriStateValue:(NSCellStateValue)triStateValue;
/*!
- @method stringWithContentsOfFile:encoding:guessEncoding:
- @abstract Tries to load a file with the specified encoding; if
guessEncoding is set to YES, it will employ some heuristics to guess the
encoding if the specified encoding fails or is set to 0.
+ @method stringWithContentsOfFile:guessedEncoding:
+ @abstract Tries to load a file with the specified encoding, it will
employ some heuristics to guess the encoding if the specified encoding fails or
is set to 0.
@discussion (comprehensive description)
@param path (description)
@param encoding (description)
- @param try (description)
@result (description)
*/
-+ (NSString *)stringWithContentsOfFile:(NSString *)path
encoding:(NSStringEncoding)encoding guessEncoding:(BOOL)try;
++ (NSString *)stringWithContentsOfFile:(NSString *)path
guessedEncoding:(NSStringEncoding)encoding;
/*!
@method unicodeNameOfCharacter:
@@ -159,15 +158,14 @@
+ (NSStringEncoding)encodingForIANACharSetName:(NSString *)name;
/*!
- @method initWithContentsOfFile:encoding:guessEncoding:
- @abstract Tries to load a file with the specified encoding; if
guessEncoding is set to YES, it will employ some heuristics to guess the
encoding if the specified encoding fails or is set to 0.
+ @method initWithContentsOfFile:guessedEncoding:
+ @abstract Tries to load a file with the specified encoding, it will
employ some heuristics to guess the encoding if the specified encoding fails or
is set to 0.
@discussion (comprehensive description)
@param path (description)
@param encoding (description)
- @param try (description)
@result (description)
*/
-- (NSString *)initWithContentsOfFile:(NSString *)path
encoding:(NSStringEncoding)encoding guessEncoding:(BOOL)try;
+- (NSString *)initWithContentsOfFile:(NSString *)path
guessedEncoding:(NSStringEncoding)encoding;
#pragma mark TeX cleaning
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2012-02-02 15:27:19 UTC (rev
18470)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2012-02-02 18:13:41 UTC (rev
18471)
@@ -186,9 +186,9 @@
return boolValue ? @"1" : @"0";
}
-+ (NSString *)stringWithContentsOfFile:(NSString *)path
encoding:(NSStringEncoding)encoding guessEncoding:(BOOL)try;
++ (NSString *)stringWithContentsOfFile:(NSString *)path
guessedEncoding:(NSStringEncoding)encoding;
{
- return [[[self alloc] initWithContentsOfFile:path encoding:encoding
guessEncoding:try] autorelease];
+ return [[[self alloc] initWithContentsOfFile:path
guessedEncoding:encoding] autorelease];
}
+ (NSString *)stringWithFileSystemRepresentation:(const char *)cstring;
@@ -259,7 +259,7 @@
return rv;
}
-- (NSString *)initWithContentsOfFile:(NSString *)path
encoding:(NSStringEncoding)encoding guessEncoding:(BOOL)try;
+- (NSString *)initWithContentsOfFile:(NSString *)path
guessedEncoding:(NSStringEncoding)encoding;
{
NSData *data = [[NSData allocWithZone:[self zone]]
initWithContentsOfFile:path options:NSMappedRead error:NULL];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
