colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-14 10:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: CPDictionary setObject: forKey: will log deprecated warning when passing nil object or key.

Browse Source 
This should be replaced by throwing exception after release of next stable version. Code included for this.
This commit is contained in:
Martin Carlberg committed 2013-02-28 22:58:42 +01:00
1 parent 62ced1749f
commit 6ee3a395fb
1 file changed
+42 -6
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPDictionary.j
+42 -6
View File
@@ -27,6 +27,9 @@
@import "CPObject.j"
#import "Ref.h"
//FIXME: After release of 0.9.7 remove below variable
var deprecatedMessage = YES;
/* @ignore */
@implementation _CPDictionaryValueEnumerator : CPEnumerator
{
@@ -260,8 +263,19 @@
{
var i = [keyArray count];
while (i--)
[self setObject:objects[i] forKey:keyArray[i]];
while (i--) {
var aValue = objects[i],
aKey = keyArray[i];
if (aValue === nil || aKey === nil) {
deprecatedMessage = NO;
CPLog.warn(@"[" + [self className] + @" " + _cmd + @"DEPRECATED: Attempt to insert nil object from objects[" + i + @"]");
objj_backtrace_print(CPLog.warn);
//FIXME: After release of 0.9.7 remove variable deprecatedMessage and change above line to this:
//[CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil object from objects[" + i + @"]"];
}
[self setObject:aValue forKey:aKey];
}
}
return self;
@@ -297,12 +311,18 @@
for (; index < argCount; index += 2)
{
var value = arguments[index];
var value = arguments[index],
aKey = arguments[index + 1];
if (value === nil)
continue;
if (value === nil || aKey === nil) {
deprecatedMessage = NO;
CPLog.warn(@"[" + [self className] + @" " + _cmd + @"DEPRECATED: Attempt to insert nil object from objects[" + (index / 2 - 1) + @"]");
objj_backtrace_print(CPLog.warn);
//FIXME: After release of 0.9.7 remove variable deprecatedMessage and change above line to this:
//[CPException raise:CPInvalidArgumentException reason:@"Attempt to insert nil object from objects[" + (index / 2 - 1) + @"]"];
}
[self setObject:value forKey:arguments[index + 1]];
[self setObject:value forKey:aKey];
}
}
@@ -611,6 +631,22 @@
*/
- (void)setObject:(id)anObject forKey:(id)aKey
{
if (deprecatedMessage && aKey === nil) {
CPLog.warn(@"[" + [self className] + @" " + _cmd + @"] DEPRECATED: Key cannot be nil");
objj_backtrace_print(CPLog.warn);
//FIXME: After release of 0.9.7 change above line to this:
//[CPException raise:CPInvalidArgumentException reason:@"Key cannot be nil"];
}
if (deprecatedMessage && anObject === nil) {
CPLog.warn(@"[" + [self className] + @" " + _cmd + @"] DEPRECATED: Object cannot be nil (key: " + aKey + @")");
objj_backtrace_print(CPLog.warn);
//FIXME: After release of 0.9.7 change above line to this:
//[CPException raise:CPInvalidArgumentException reason:@"Object cannot be nil (key: " + aKey + @")"];
}
//FIXME: After release of 0.9.7 remove below line.
deprecatedMessage = YES;
self.setValueForKey(aKey, anObject);
}