gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-25 05:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAccess/EOAdaptor.m (databaseEncoding): Use NSStringEncoding

Browse source 
enum symbols instead of literal values.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23869 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers 2006-10-14 09:05:37 +00:00
parent 30aad3d31d
commit 026bcaf9ed
2 changed files with 55 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2006-10-14 David Ayers <ayers@fsfe.org>
* EOAccess/EOAdaptor.m (databaseEncoding): Use NSStringEncoding
enum symbols instead of literal values.
2006-10-13 Matt Rice <ratmice@yahoo.com> 2006-10-13 Matt Rice <ratmice@yahoo.com>
* EOModeler/EOModelerDocument.m (-windowWillClose:): If document * EOModeler/EOModelerDocument.m (-windowWillClose:): If document
@ -16,7 +21,7 @@
2006-10-13 David Ayers <ayers@fsfe.org> 2006-10-13 David Ayers <ayers@fsfe.org>
* EOAccess/EOAdaptor.m (databaseEncoding): Reimplement to not * EOAccess/EOAdaptor.m (databaseEncoding): Reimplement to not
rely on GSEncodingName. rely in GSEncodingName.
2006-10-09 Nicola Pero <nicola.pero@meta-innovation.com> 2006-10-09 Nicola Pero <nicola.pero@meta-innovation.com>

91
EOAccess/EOAdaptor.m
View file

@ -96,6 +96,47 @@ NSString *EOConnectionDictionaryKey = @"EOConnectionDictionaryKey";
NSString *EOAdministrativeConnectionDictionaryKey NSString *EOAdministrativeConnectionDictionaryKey
= @"EOAdministrativeConnectionDictionaryKey"; = @"EOAdministrativeConnectionDictionaryKey";
/* This mapping should be kept in sync with NSStringEncoding in NSString.h. */
static struct { NSString *name; NSStringEncoding encoding; } encodingMap[] = {
{ @"NSASCIIStringEncoding", NSASCIIStringEncoding },
{ @"NSNEXTSTEPStringEncoding", NSNEXTSTEPStringEncoding },
{ @"NSJapaneseEUCStringEncoding", NSJapaneseEUCStringEncoding },
{ @"NSUTF8StringEncoding", NSUTF8StringEncoding },
{ @"NSISOLatin1StringEncoding", NSISOLatin1StringEncoding },
{ @"NSSymbolStringEncoding", NSSymbolStringEncoding },
{ @"NSNonLossyASCIIStringEncoding", NSNonLossyASCIIStringEncoding },
{ @"NSShiftJISStringEncoding", NSShiftJISStringEncoding },
{ @"NSISOLatin2StringEncoding", NSISOLatin2StringEncoding },
{ @"NSUnicodeStringEncoding", NSUnicodeStringEncoding },
{ @"NSWindowsCP1251StringEncoding", NSWindowsCP1251StringEncoding },
{ @"NSWindowsCP1252StringEncoding", NSWindowsCP1252StringEncoding },
{ @"NSWindowsCP1253StringEncoding", NSWindowsCP1253StringEncoding },
{ @"NSWindowsCP1254StringEncoding", NSWindowsCP1254StringEncoding },
{ @"NSWindowsCP1250StringEncoding", NSWindowsCP1250StringEncoding },
{ @"NSISO2022JPStringEncoding", NSISO2022JPStringEncoding },
{ @"NSMacOSRomanStringEncoding", NSMacOSRomanStringEncoding },
{ @"NSProprietaryStringEncoding", NSProprietaryStringEncoding },
{ @"NSKOI8RStringEncoding", NSKOI8RStringEncoding },
{ @"NSISOLatin3StringEncoding", NSISOLatin3StringEncoding },
{ @"NSISOLatin4StringEncoding", NSISOLatin4StringEncoding },
{ @"NSISOCyrillicStringEncoding", NSISOCyrillicStringEncoding },
{ @"NSISOArabicStringEncoding", NSISOArabicStringEncoding },
{ @"NSISOGreekStringEncoding", NSISOGreekStringEncoding },
{ @"NSISOHebrewStringEncoding", NSISOHebrewStringEncoding },
{ @"NSISOLatin5StringEncoding", NSISOLatin5StringEncoding },
{ @"NSISOLatin6StringEncoding", NSISOLatin6StringEncoding },
{ @"NSISOThaiStringEncoding", NSISOThaiStringEncoding },
{ @"NSISOLatin7StringEncoding", NSISOLatin7StringEncoding },
{ @"NSISOLatin8StringEncoding", NSISOLatin8StringEncoding },
{ @"NSISOLatin9StringEncoding", NSISOLatin9StringEncoding },
{ @"NSGB2312StringEncoding", NSGB2312StringEncoding },
{ @"NSUTF7StringEncoding", NSUTF7StringEncoding },
{ @"NSGSM0338StringEncoding", NSGSM0338StringEncoding },
{ @"NSBIG5StringEncoding", NSBIG5StringEncoding },
{ @"NSKoreanEUCStringEncoding", NSKoreanEUCStringEncoding },
{ nil, 0 }
};
@implementation EOAdaptor @implementation EOAdaptor
+ (id)adaptorWithModel: (EOModel *)model + (id)adaptorWithModel: (EOModel *)model
@ -582,7 +623,7 @@ NSString *EOAdministrativeConnectionDictionaryKey
- (NSStringEncoding)databaseEncoding - (NSStringEncoding)databaseEncoding
{ {
static NSDictionary *encodingDictionary = nil; static NSMutableDictionary *encodingDictionary = nil;
NSDictionary *connectionDictionary; NSDictionary *connectionDictionary;
NSString *encodingName; NSString *encodingName;
NSString *encodingValue; NSString *encodingValue;
@ -592,47 +633,13 @@ NSString *EOAdministrativeConnectionDictionaryKey
if (encodingDictionary == nil) if (encodingDictionary == nil)
{ {
/* This dictionary should be kept in sync with NSStringEncoding unsigned int i;
in NSString.h. */ encodingDictionary = [[NSMutableDictionary alloc] initWithCapacity: 64];
encodingDictionary = RETAIN([@"{" for (i = 0; encodingMap[i].name != nil; i++)
@"NSASCIIStringEncoding = 1;" {
@"NSNEXTSTEPStringEncoding = 2;" NSNumber *val = [NSNumber numberWithInt: encodingMap[i].encoding];
@"NSJapaneseEUCStringEncoding = 3;" [encodingDictionary setObject: val forKey: encodingMap[i].name];
@"NSUTF8StringEncoding = 4;" }
@"NSISOLatin1StringEncoding = 5;"
@"NSSymbolStringEncoding = 6;"
@"NSNonLossyASCIIStringEncoding = 7;"
@"NSShiftJISStringEncoding = 8;"
@"NSISOLatin2StringEncoding = 9;"
@"NSUnicodeStringEncoding = 10;"
@"NSWindowsCP1251StringEncoding = 11;"
@"NSWindowsCP1252StringEncoding = 12;"
@"NSWindowsCP1253StringEncoding = 13;"
@"NSWindowsCP1254StringEncoding = 14;"
@"NSWindowsCP1250StringEncoding = 15;"
@"NSISO2022JPStringEncoding = 21;"
@"NSMacOSRomanStringEncoding = 30;"
@"NSProprietaryStringEncoding = 31;"
@"NSKOI8RStringEncoding = 50;"
@"NSISOLatin3StringEncoding = 51;"
@"NSISOLatin4StringEncoding = 52;"
@"NSISOCyrillicStringEncoding = 22;"
@"NSISOArabicStringEncoding = 53;"
@"NSISOGreekStringEncoding = 54;"
@"NSISOHebrewStringEncoding = 55;"
@"NSISOLatin5StringEncoding = 57;"
@"NSISOLatin6StringEncoding = 58;"
@"NSISOThaiStringEncoding = 59;"
@"NSISOLatin7StringEncoding = 61;"
@"NSISOLatin8StringEncoding = 62;"
@"NSISOLatin9StringEncoding = 63;"
@"NSGB2312StringEncoding = 56;"
@"NSUTF7StringEncoding = 64;"
@"NSGSM0338StringEncoding = 65;"
@"NSBIG5StringEncoding = 66;"
@"NSKoreanEUCStringEncoding = 67;"
@"}" propertyList]);
} }
connectionDictionary = [self connectionDictionary]; connectionDictionary = [self connectionDictionary];