Enable the storing of the Ink Document.gorm as a NIB.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@37287 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-10-26 21:35:26 +00:00
parent ef9a3eca84
commit 2aa362da0e
2 changed files with 31 additions and 15 deletions

View file

@ -1,3 +1,8 @@
2013-10-26 Fred Kiefer <FredKiefer@gmx.de>
* Plugins/Nib/GormNibWrapperBuilder.m (-initWithDocument:):
Don't store nil values in maps.
2013-10-26 Riccardo Mottola <rm@gnu.org>
* Plugins/Nib/GormNibWrapperBuilder.m

View file

@ -70,14 +70,14 @@
NSNumber *currOid = [NSNumber numberWithUnsignedInt: oid++];
// NSString *currOid = [NSString stringWithFormat: @"%d", oid++];
if([o isMemberOfClass: [NSNibConnector class]])
if ([o isMemberOfClass: [NSNibConnector class]])
{
id src = [o source];
id dst = [o destination];
NSString *name = nil;
//
if(src != nil)
if (src != nil)
{
name = [document nameForObject: src];
}
@ -86,35 +86,46 @@
continue;
}
if([name isEqual: @"NSOwner"])
if ([name isEqual: @"NSOwner"])
{
name = @"File's Owner";
}
if([name isEqual: @"NSMenu"])
if ([name isEqual: @"NSMenu"])
{
name = @"MainMenu";
}
else if([name isEqual: @"NSFirst"])
else if ([name isEqual: @"NSFirst"])
{
// skip it...
continue;
}
NSMapInsert(_objects, src, dst);
if(dst == nil)
if (dst == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in objects map.",src,dst);
NSLog(@"==> WARNING: value for object %@ is %@ in objects map.", src, dst);
}
NSMapInsert(_names, src, name);
if(name == nil)
else
{
NSMapInsert(_objects, src, dst);
}
if (name == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in names map.",src,name);
}
NSMapInsert(_oids, src, currOid);
if(currOid == nil)
NSLog(@"==> WARNING: value for object %@ is %@ in names map.", src, name);
}
else
{
NSMapInsert(_names, src, name);
}
if (currOid == nil)
{
NSLog(@"==> WARNING: value for object %@ is %@ in oids map.",src,currOid);
NSLog(@"==> WARNING: value for object %@ is %@ in oids map.", src, currOid);
}
else
{
NSMapInsert(_oids, src, currOid);
}
}
else
{