diff --git a/ChangeLog b/ChangeLog index 316135160..1156f2d65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-07-16 Richard Frith-Macdonald + + * Source/NSArray.m: Added ([writeToURL:atomically:]) for + MacOS-X compatibility + * Source/NSDictionary.m: ditto + 2001-07-15 Richard Frith-Macdonald * Source/NSProcessInfo.m: Added -processIdentifier for compatibility diff --git a/Headers/gnustep/base/NSArray.h b/Headers/gnustep/base/NSArray.h index 6b4f9acbe..ee8be7a4e 100644 --- a/Headers/gnustep/base/NSArray.h +++ b/Headers/gnustep/base/NSArray.h @@ -28,6 +28,7 @@ #include @class NSString; +@class NSURL; @interface NSArray : NSObject @@ -89,7 +90,9 @@ indent: (unsigned int)level; - (BOOL) writeToFile: (NSString*)path atomically: (BOOL)useAuxilliaryFile; - +#ifndef STRICT_OPENSTEP +- (BOOL) writeToURL: (NSURL*)url atomically: (BOOL)useAuxilliaryFile; +#endif @end diff --git a/Headers/gnustep/base/NSDictionary.h b/Headers/gnustep/base/NSDictionary.h index f0ad6dc29..a620ad988 100644 --- a/Headers/gnustep/base/NSDictionary.h +++ b/Headers/gnustep/base/NSDictionary.h @@ -26,7 +26,7 @@ #include -@class NSArray, NSString, NSEnumerator; +@class NSArray, NSString, NSEnumerator, NSURL; @interface NSDictionary : NSObject + (id) dictionary; @@ -66,10 +66,10 @@ - (id) objectForKey: (id)aKey; // Primitive - (NSArray*) objectsForKeys: (NSArray*)keys notFoundMarker: (id)anObject; -- (BOOL) writeToFile: (NSString*)path atomically: (BOOL)useAuxiliaryFile; - -/* Accessing file attributes is a catagory declared in NSFileManager.h*/ - +- (BOOL) writeToFile: (NSString*)path atomically: (BOOL)useAuxilliaryFile; +#ifndef STRICT_OPENSTEP +- (BOOL) writeToURL: (NSURL*)url atomically: (BOOL)useAuxilliaryFile; +#endif @end @interface NSMutableDictionary: NSDictionary diff --git a/Source/NSArray.m b/Source/NSArray.m index 0c497e28f..22701a7b6 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -850,6 +850,17 @@ static NSString *indentStrings[] = { return [desc writeToFile: path atomically: useAuxiliaryFile]; } +- (BOOL) writeToURL: (NSURL *)url atomically: (BOOL)useAuxiliaryFile +{ + NSDictionary *loc; + NSString *desc; + + loc = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]; + desc = [self descriptionWithLocale: loc indent: 0]; + + return [desc writeToURL: url atomically: useAuxiliaryFile]; +} + @end diff --git a/Source/NSDictionary.m b/Source/NSDictionary.m index 7688e91fa..f2b7e5a52 100644 --- a/Source/NSDictionary.m +++ b/Source/NSDictionary.m @@ -631,6 +631,17 @@ compareIt(id o1, id o2, void* context) return [desc writeToFile: path atomically: useAuxiliaryFile]; } +- (BOOL) writeToURL: (NSURL *)url atomically: (BOOL)useAuxiliaryFile +{ + NSDictionary *loc; + NSString *desc; + + loc = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]; + desc = [self descriptionWithLocale: loc indent: 0]; + + return [desc writeToURL: url atomically: useAuxiliaryFile]; +} + - (NSString*) description { return [self descriptionWithLocale: nil indent: 0];