gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove calls to debug method.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25399 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2007-08-20 01:19:18 +00:00
parent c7caea4bd5
commit 66ae6bd406
3 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-08-19 21:18-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSController.m
* Source/NSObjectController.m: Remove calls to debug method.
2007-08-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSButton.m ([performKeyEquivalent:]): Only test for modal

1
Source/NSController.m
View file

@ -61,7 +61,6 @@
{
if([aDecoder allowsKeyedCoding])
{
NSLog(@"%@-%@",self,[aDecoder keyMap]);
ASSIGN(_declared_keys,[aDecoder decodeObjectForKey: @"NSDeclaredKeys"]);
}
else

82
Source/NSObjectController.m
View file

@ -45,15 +45,18 @@
@implementation _NSManagedProxy
- (id) initWithCoder: (NSCoder *)coder
{
if([coder allowsKeyedCoding])
if((self = [super init]) != nil)
{
NSLog(@"%@ - %@",self,[coder keyMap]);
ASSIGN(_entity_name_key,[coder decodeObjectForKey: @"NSEntityName"]);
}
else
{
ASSIGN(_entity_name_key,[coder decodeObject]);
if([coder allowsKeyedCoding])
{
ASSIGN(_entity_name_key,[coder decodeObjectForKey: @"NSEntityName"]);
}
else
{
ASSIGN(_entity_name_key,[coder decodeObject]);
}
}
return self;
}
- (void) encodeWithCoder: (NSCoder *)coder
@ -94,6 +97,7 @@
[self setContent: content];
[self setObjectClass: [NSMutableDictionary class]];
[self setEditable: YES];
_managed_proxy = nil;
}
return self;
@ -112,35 +116,51 @@
[super dealloc];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
- (void) encodeWithCoder: (NSCoder *)coder
{
[super encodeWithCoder: aCoder];
// TODO
}
- (id) initWithCoder: (NSCoder *)aDecoder
{
self = [super initWithCoder: aDecoder];
if ([self automaticallyPreparesContent])
{
if ([self managedObjectContext] != nil)
{
[self fetch: aDecoder];
}
else
{
[self prepareContent];
}
}
if([aDecoder allowsKeyedCoding])
[super encodeWithCoder: coder];
if([coder allowsKeyedCoding])
{
_is_editable = [aDecoder decodeBoolForKey: @"NSEditable"];
_automatically_prepares_content = [aDecoder decodeBoolForKey: @"NSAutomaticallyPreparesContent"];
ASSIGN(_managed_proxy, [aDecoder decodeObjectForKey: @"_NSManagedProxy"]);
[coder encodeBool: _is_editable forKey: @"NSEditable"];
[coder encodeBool: _automatically_prepares_content forKey: @"NSAutomaticallyPreparesContent"];
[coder encodeObject: _managed_proxy forKey: @"_NSManagedProxy"];
}
else
{
[coder encodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
[coder encodeValueOfObjCType: @encode(BOOL) at: &_automatically_prepares_content];
[coder encodeConditionalObject: _managed_proxy];
}
}
- (id) initWithCoder: (NSCoder *)coder
{
if((self = [super initWithCoder: coder]) != nil)
{
if ([self automaticallyPreparesContent])
{
if ([self managedObjectContext] != nil)
{
[self fetch: coder];
}
else
{
[self prepareContent];
}
}
if([coder allowsKeyedCoding])
{
_is_editable = [coder decodeBoolForKey: @"NSEditable"];
_automatically_prepares_content = [coder decodeBoolForKey: @"NSAutomaticallyPreparesContent"];
ASSIGN(_managed_proxy, [coder decodeObjectForKey: @"_NSManagedProxy"]);
}
else
{
[coder decodeValueOfObjCType: @encode(BOOL) at: &_is_editable];
[coder decodeValueOfObjCType: @encode(BOOL) at: &_automatically_prepares_content];
ASSIGN(_managed_proxy, [coder decodeObject]);
}
}
return self;