mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Minor naming consistency tidyups, and a fix to let java code using property
lists work with a base library that includes the new NSPropertyListSerialisation class. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18526 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald
parent
a5cf95ab82
commit
24d6fe34b0
5 changed files with 91 additions and 12 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2004-02-02 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/Headers/Foundation/NSPropertyList.h:
|
||||
Use GNUstep rather than GNUStep in property list format names as
|
||||
it seems to be the more common capitalisation.
|
||||
* Source/NSPropertyList.m: Add new methods exposed to java by jigs
|
||||
to avoid java errors with conflicting implementations of the
|
||||
NSPropertyListSerialisation class.
|
||||
|
||||
2004-02-01 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/Additions/GSMime.h: improve consistency of naming of
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/** Interface for NSPropertyList for GNUStep
|
||||
/** Interface for NSPropertyList for GNUstep
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
|
@ -56,8 +56,8 @@ typedef enum {
|
|||
* Specifies the serialisation format for a serialised property list.
|
||||
*/
|
||||
typedef enum {
|
||||
NSPropertyListGNUStepFormat,
|
||||
/** <strong>NSPropertyListGNUStepFormat</strong>
|
||||
NSPropertyListGNUstepFormat,
|
||||
/** <strong>NSPropertyListGNUstepFormat</strong>
|
||||
* extension of OpenStep format */
|
||||
NSPropertyListGNUstepBinaryFormat,
|
||||
/** <strong>NSPropertyListGNUstepBinaryFormat</strong>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/** Implementation for NSKeyedArchiver for GNUStep
|
||||
/** Implementation for NSKeyedArchiver for GNUstep
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/** Implementation for NSKeyedUnarchiver for GNUStep
|
||||
/** Implementation for NSKeyedUnarchiver for GNUstep
|
||||
Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/** Interface for NSPropertyList for GNUStep
|
||||
/** Interface for NSPropertyList for GNUstep
|
||||
Copyright (C) 2003,2004 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
|
@ -1503,7 +1503,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
{
|
||||
[dest appendBytes: "<true/>\n" length: 8];
|
||||
}
|
||||
else if (x == NSPropertyListGNUStepFormat)
|
||||
else if (x == NSPropertyListGNUstepFormat)
|
||||
{
|
||||
[dest appendBytes: "<*BY>\n" length: 6];
|
||||
}
|
||||
|
|
@ -1518,7 +1518,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
{
|
||||
[dest appendBytes: "<false/>\n" length: 9];
|
||||
}
|
||||
else if (x == NSPropertyListGNUStepFormat)
|
||||
else if (x == NSPropertyListGNUstepFormat)
|
||||
{
|
||||
[dest appendBytes: "<*BN>\n" length: 6];
|
||||
}
|
||||
|
|
@ -1536,7 +1536,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
XString([obj stringValue], dest);
|
||||
[dest appendBytes: "</integer>\n" length: 11];
|
||||
}
|
||||
else if (x == NSPropertyListGNUStepFormat)
|
||||
else if (x == NSPropertyListGNUstepFormat)
|
||||
{
|
||||
[dest appendBytes: "<*I" length: 3];
|
||||
PString([obj stringValue], dest);
|
||||
|
|
@ -1555,7 +1555,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
XString([obj stringValue], dest);
|
||||
[dest appendBytes: "</real>\n" length: 8];
|
||||
}
|
||||
else if (x == NSPropertyListGNUStepFormat)
|
||||
else if (x == NSPropertyListGNUstepFormat)
|
||||
{
|
||||
[dest appendBytes: "<*R" length: 3];
|
||||
PString([obj stringValue], dest);
|
||||
|
|
@ -1615,7 +1615,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
[dest appendData: obj];
|
||||
[dest appendBytes: "</date>\n" length: 8];
|
||||
}
|
||||
else if (x == NSPropertyListGNUStepFormat)
|
||||
else if (x == NSPropertyListGNUstepFormat)
|
||||
{
|
||||
[dest appendBytes: "<*D" length: 3];
|
||||
obj = [obj descriptionWithCalendarFormat: @"%Y-%m-%d %H:%M:%S %z"
|
||||
|
|
@ -1996,7 +1996,7 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
// FIXME ... need to check properly.
|
||||
switch (aFormat)
|
||||
{
|
||||
case NSPropertyListGNUStepFormat:
|
||||
case NSPropertyListGNUstepFormat:
|
||||
return YES;
|
||||
|
||||
case NSPropertyListGNUstepBinaryFormat:
|
||||
|
|
@ -2168,3 +2168,73 @@ OAppend(id obj, NSDictionary *loc, unsigned lev, unsigned step,
|
|||
}
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
@interface NSPropertyListSerialization (JavaCompatibility)
|
||||
+ (NSData*) dataFromPropertyList: (id)anObject;
|
||||
+ (id) propertyListFromData: (NSData*)aData;
|
||||
+ (id) propertyListFromString: (NSString*)aString;
|
||||
+ (NSString*) stringFromPropertyList: (id)anObject;
|
||||
@end
|
||||
|
||||
@implementation NSPropertyListSerialization (JavaCompatibility)
|
||||
+ (NSData*) dataFromPropertyList: (id)anObject
|
||||
{
|
||||
NSString *dummy;
|
||||
|
||||
if (anObject == nil)
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
return [self dataFromPropertyList: anObject
|
||||
format: NSPropertyListGNUstepBinaryFormat
|
||||
errorDescription: &dummy];
|
||||
}
|
||||
+ (id) propertyListFromData: (NSData*)aData
|
||||
{
|
||||
NSPropertyListFormat format;
|
||||
NSString *dummy;
|
||||
|
||||
if (aData == nil)
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
return [self propertyListFromData: aData
|
||||
mutabilityOption: NSPropertyListImmutable
|
||||
format: &format
|
||||
errorDescription: &dummy];
|
||||
}
|
||||
+ (id) propertyListFromString: (NSString*)aString
|
||||
{
|
||||
NSData *aData;
|
||||
NSPropertyListFormat format;
|
||||
NSString *dummy;
|
||||
|
||||
aData = [aString dataUsingEncoding: NSUTF8StringEncoding];
|
||||
if (aData == nil)
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
return [self propertyListFromData: aData
|
||||
mutabilityOption: NSPropertyListImmutable
|
||||
format: &format
|
||||
errorDescription: &dummy];
|
||||
}
|
||||
+ (NSString*) stringFromPropertyList: (id)anObject
|
||||
{
|
||||
NSString *string;
|
||||
NSData *aData;
|
||||
|
||||
if (anObject == nil)
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
aData = [self dataFromPropertyList: anObject
|
||||
format: NSPropertyListGNUstepFormat
|
||||
errorDescription: &string];
|
||||
string = [NSString alloc];
|
||||
string = [string initWithData: aData encoding: NSASCIIStringEncoding];
|
||||
return AUTORELEASE(string);
|
||||
}
|
||||
@end
|
||||
|
|
|
|||
Loading…
Reference in a new issue