Correcting issue with connections.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@15545 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-01-08 05:54:20 +00:00
parent f86a25b225
commit 9dc8e5105c
3 changed files with 30 additions and 10 deletions

View file

@ -1,3 +1,11 @@
2003-01-08 Gregory John Casamento <greg_casamento@yahoo.com>
* GormClassManager.m: Added some NSDebugLog statements
to assist with debugging.
* GormInspectorManager.m: Corrected a problem which was
preventing connections being made to actions added to
a subclass.
2003-01-05 Gregory John Casamento <greg_casamento@yahoo.com>
* Gorm.m: Cleaned up some NSLog statements.

View file

@ -299,6 +299,8 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
Class theClass = [obj class];
NSString *customClassName = [self customClassForObject: obj];
NSDebugLog(@"Object: %@",obj);
NSDebugLog(@"Custom class: %@",customClassName);
if(customClassName != nil)
{
// if the object has been mapped to a custom class, then
@ -346,6 +348,8 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
className = NSStringFromClass(theClass);
actions = [self allActionsForClassNamed: className];
}
NSDebugLog(@"class=%@ actions=%@",className,actions);
return actions;
}
@ -1231,7 +1235,9 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
// custom class support...
- (NSString *) customClassForObject: (id)object
{
return [customClassMap objectForKey: object];
NSString *result = [customClassMap objectForKey: object];
NSDebugLog(@"in customClassForObject: object = %@, result = %@, customClassMap = %@",object, result, customClassMap);
return result;
}
- (void) setCustomClass: (NSString *)className
@ -1329,6 +1335,10 @@ NSString *IBClassNameChangedNotification = @"IBClassNameChangedNotification";
{
return @"FirstResponder";
}
if ([className isEqualToString: @"GormFilesOwner"])
{
return @"FilesOwner";
}
return className;
}

View file

@ -38,7 +38,6 @@
@implementation GormEmptyInspector
- (void) dealloc
{
//RELEASE(window);
[super dealloc];
}
@ -79,7 +78,6 @@
@implementation GormMultipleInspector
- (void) dealloc
{
//RELEASE(window);
[super dealloc];
}
@ -118,7 +116,6 @@
@implementation GormNotApplicableInspector
- (void) dealloc
{
//RELEASE(window);
[super dealloc];
}
@ -393,8 +390,8 @@
*/
else
{
[panel setTitle: [NSString stringWithFormat: @"%@ Inspector",
NSStringFromClass([obj class])]];
NSString *newTitle = [GormClassManager correctClassName: NSStringFromClass([obj class])];
[panel setTitle: [NSString stringWithFormat: @"%@ Inspector", newTitle]];
}
if (count == 0)
@ -684,17 +681,24 @@ selectCellWithString: (NSString*)title
con = [connectors objectAtIndex: index];
if ([con isKindOfClass: [NSNibControlConnector class]] == YES)
{
NSString *name = nil;
RELEASE(actions);
// get the name of the object...
name = [[(id<IB>)NSApp activeDocument] nameForObject: [con destination]];
actions = RETAIN([[NSApp classManager]
allActionsForObject: [con destination]]);
allActionsForObject: name]);
break;
}
}
if (con == nil)
{
NSString *name = [[(id<IB>)NSApp activeDocument] nameForObject:
[NSApp connectDestination]];
RELEASE(actions);
// get the name of the object...
actions = RETAIN([[NSApp classManager]
allActionsForObject: [NSApp connectDestination]]);
allActionsForObject: name]);
if ([actions count] > 0)
{
con = [NSNibControlConnector new];
@ -707,7 +711,6 @@ selectCellWithString: (NSString*)title
if (currentConnector != con)
{
ASSIGN(currentConnector, con);
// [newBrowser setLastColumn: 0];
}
action = [con label];
if (action != nil)
@ -901,7 +904,6 @@ selectCellWithString: (NSString*)title
RELEASE(outlets);
RELEASE(okButton);
RELEASE(revertButton);
// RELEASE(window);
[super dealloc];
}