diff --git a/Headers/Foundation/NSPersonNameComponentsFormatter.h b/Headers/Foundation/NSPersonNameComponentsFormatter.h index 489d12bfa..068937023 100644 --- a/Headers/Foundation/NSPersonNameComponentsFormatter.h +++ b/Headers/Foundation/NSPersonNameComponentsFormatter.h @@ -51,7 +51,7 @@ typedef NSUInteger NSPersonNameComponentsFormatterOptions; { @private BOOL _phonetic; - NSPersonNameComponentsFormatterStyle style; + NSPersonNameComponentsFormatterStyle _style; } // Designated init... diff --git a/Source/NSByteCountFormatter.m b/Source/NSByteCountFormatter.m index eabb495ef..7beb1b8a8 100644 --- a/Source/NSByteCountFormatter.m +++ b/Source/NSByteCountFormatter.m @@ -67,6 +67,13 @@ GS_PRIVATE_INTERNAL(NSByteCountFormatter) return [formatter stringFromByteCount: byteCount]; } +- (NSString *)stringForObjectValue: (id)obj +{ + long long byteCount = [obj longLongValue]; + return [[self class] stringFromByteCount: byteCount + countStyle: NSByteCountFormatterUseDefault]; +} + - (NSByteCountFormatterUnits) _adaptiveSettings: (double)byteCount { NSByteCountFormatterUnits units = NSByteCountFormatterUseDefault; diff --git a/Source/NSPersonNameComponentsFormatter.m b/Source/NSPersonNameComponentsFormatter.m index c37e91467..bac9b6bdb 100644 --- a/Source/NSPersonNameComponentsFormatter.m +++ b/Source/NSPersonNameComponentsFormatter.m @@ -28,6 +28,17 @@ @implementation NSPersonNameComponentsFormatter +- (instancetype) init +{ + self = [super init]; + if(self != nil) + { + _phonetic = NO; + _style = NSPersonNameComponentsFormatterStyleDefault; + } + return self; +} + // Designated init... + (NSString *) localizedStringFromPersonNameComponents: (NSPersonNameComponents *)components style: (NSPersonNameComponentsFormatterStyle)nameFormatStyle @@ -36,29 +47,45 @@ return nil; } +- (NSString *)stringForObjectValue: (id)obj +{ + NSPersonNameComponents *pnc = (NSPersonNameComponents *)obj; + return [[self class] localizedStringFromPersonNameComponents: pnc + style: NSPersonNameComponentsFormatterStyleDefault + options: 0L]; +} + // Setters - (NSPersonNameComponentsFormatterStyle) style { - return 0; + return _style; } - (void) setStyle: (NSPersonNameComponentsFormatterStyle)style { + _style = style; } - (BOOL) isPhonetic { - return NO; + return _phonetic; } - (void) setPhonetic: (BOOL)flag { + _phonetic = flag; } // Convenience methods... - (NSString *) stringFromPersonNameComponents: (NSPersonNameComponents *)components { - return nil; + NSString *result = nil; + + switch (_style) + { + } + + return result; } - (NSAttributedString *) annotatedStringFromPersonNameComponents: (NSPersonNameComponents *)components @@ -68,6 +95,7 @@ - (NSPersonNameComponents *) personNameComponentsFromString: (NSString *)string { + return nil; }