Author: fredkiefer
Date: Tue Mar 21 00:04:27 2017
New Revision: 40406
URL: http://svn.gna.org/viewcvs/gnustep?rev=40406&view=rev
Log:
* Source/GSXibKeyedUnarchiver.m:
Merge some of the changes from the testplant branch.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/GSXibKeyedUnarchiver.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40406&r1=40405&r2=40406&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Tue Mar 21 00:04:27 2017
@@ -1,3 +1,8 @@
+2017-03-20 Fred Kiefer <[email protected]>
+
+ * Source/GSXibKeyedUnarchiver.m:
+ Merge some of the changes from the testplant branch.
+
2017-03-19 Fred Kiefer <[email protected]>
* Source/NSBrowser.m: Add encoding of NSColumnsAutosaveName.
Modified: libs/gui/trunk/Source/GSXibKeyedUnarchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/GSXibKeyedUnarchiver.m?rev=40406&r1=40405&r2=40406&view=diff
==============================================================================
--- libs/gui/trunk/Source/GSXibKeyedUnarchiver.m (original)
+++ libs/gui/trunk/Source/GSXibKeyedUnarchiver.m Tue Mar 21 00:04:27 2017
@@ -625,6 +625,36 @@
return new;
}
+ else if ([@"point" isEqualToString: elementName])
+ {
+ NSPoint point = [self decodePointForKey: [element attributeForKey:
@"key"]];
+ id new = [NSValue valueWithPoint: point];
+
+ if (objID != nil)
+ [decoded setObject: new forKey: objID];
+
+ return new;
+ }
+ else if ([@"size" isEqualToString: elementName])
+ {
+ NSSize size = [self decodeSizeForKey: [element attributeForKey: @"key"]];
+ id new = [NSValue valueWithSize: size];
+
+ if (objID != nil)
+ [decoded setObject: new forKey: objID];
+
+ return new;
+ }
+ else if ([@"rect" isEqualToString: elementName])
+ {
+ NSRect rect = [self decodeRectForKey: [element attributeForKey: @"key"]];
+ id new = [NSValue valueWithRect: rect];
+
+ if (objID != nil)
+ [decoded setObject: new forKey: objID];
+
+ return new;
+ }
else if ([@"reference" isEqualToString: elementName])
{
NSString *ref = [element attributeForKey: @"ref"];
@@ -668,7 +698,7 @@
else if ([@"bytes" isEqualToString: elementName])
{
id new = AUTORELEASE([[NSData alloc] initWithBase64EncodedString:
[element value]
- options: 0]);
+ options:
NSDataBase64DecodingIgnoreUnknownCharacters]);
if (objID != nil)
[decoded setObject: new forKey: objID];
@@ -802,7 +832,8 @@
if (o != nil)
{
- if ([o isKindOfClass: [NSNumber class]] == YES)
+ if (([o isKindOfClass: [NSNumber class]] == YES) ||
+ ([o isKindOfClass: [NSString class]] == YES))
{
return [o boolValue];
}
@@ -847,7 +878,8 @@
if (o != nil)
{
- if ([o isKindOfClass: [NSNumber class]] == YES)
+ if (([o isKindOfClass: [NSNumber class]] == YES) ||
+ ([o isKindOfClass: [NSString class]] == YES))
{
return [o doubleValue];
}
@@ -868,7 +900,8 @@
if (o != nil)
{
- if ([o isKindOfClass: [NSNumber class]] == YES)
+ if (([o isKindOfClass: [NSNumber class]] == YES) ||
+ ([o isKindOfClass: [NSString class]] == YES))
{
return [o floatValue];
}
@@ -889,7 +922,8 @@
if (o != nil)
{
- if ([o isKindOfClass: [NSNumber class]] == YES)
+ if (([o isKindOfClass: [NSNumber class]] == YES) ||
+ ([o isKindOfClass: [NSString class]] == YES))
{
long long l = [o longLongValue];
@@ -912,7 +946,8 @@
if (o != nil)
{
- if ([o isKindOfClass: [NSNumber class]] == YES)
+ if (([o isKindOfClass: [NSNumber class]] == YES) ||
+ ([o isKindOfClass: [NSString class]] == YES))
{
long long l = [o longLongValue];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
