in the message window code, create the processed file name/line number right away, to avoid having to store an extra number
This commit is contained in:
parent
4d276878e2
commit
00fc846037
|
@ -154,14 +154,16 @@
|
||||||
NSString * name = currentMessage->name != NULL ? [NSString stringWithUTF8String: currentMessage->name]
|
NSString * name = currentMessage->name != NULL ? [NSString stringWithUTF8String: currentMessage->name]
|
||||||
: [[NSProcessInfo processInfo] processName];
|
: [[NSProcessInfo processInfo] processName];
|
||||||
|
|
||||||
|
NSString * file = [NSString stringWithFormat: @"%@:%d", [[NSString stringWithUTF8String: currentMessage->file] lastPathComponent],
|
||||||
|
currentMessage->line];
|
||||||
|
|
||||||
NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys:
|
NSDictionary * message = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||||
[NSString stringWithUTF8String: currentMessage->message], @"Message",
|
[NSString stringWithUTF8String: currentMessage->message], @"Message",
|
||||||
[NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
|
[NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
|
||||||
[NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
|
[NSNumber numberWithUnsignedInteger: currentIndex++], @"Index", //more accurate when sorting by date
|
||||||
[NSNumber numberWithInteger: currentMessage->level], @"Level",
|
[NSNumber numberWithInteger: currentMessage->level], @"Level",
|
||||||
name, @"Name",
|
name, @"Name",
|
||||||
[NSString stringWithUTF8String: currentMessage->file], @"File",
|
file, @"File", nil];
|
||||||
[NSNumber numberWithInteger: currentMessage->line], @"Line", nil];
|
|
||||||
|
|
||||||
[fMessages addObject: message];
|
[fMessages addObject: message];
|
||||||
}
|
}
|
||||||
|
@ -245,7 +247,7 @@
|
||||||
tableColumn: (NSTableColumn *) column row: (NSInteger) row mouseLocation: (NSPoint) mouseLocation
|
tableColumn: (NSTableColumn *) column row: (NSInteger) row mouseLocation: (NSPoint) mouseLocation
|
||||||
{
|
{
|
||||||
NSDictionary * message = [fMessages objectAtIndex: row];
|
NSDictionary * message = [fMessages objectAtIndex: row];
|
||||||
return [NSString stringWithFormat: @"%@:%@", [[message objectForKey: @"File"] lastPathComponent], [message objectForKey: @"Line"]];
|
return [message objectForKey: @"File"];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) copy: (id) sender
|
- (void) copy: (id) sender
|
||||||
|
@ -383,8 +385,8 @@
|
||||||
level = @"";
|
level = @"";
|
||||||
}
|
}
|
||||||
|
|
||||||
return [NSString stringWithFormat: @"%@ %@:%@ [%@] %@: %@", [message objectForKey: @"Date"],
|
return [NSString stringWithFormat: @"%@ %@ [%@] %@: %@", [message objectForKey: @"Date"],
|
||||||
[[message objectForKey: @"File"] lastPathComponent], [message objectForKey: @"Line"], level,
|
[message objectForKey: @"File"], level,
|
||||||
[message objectForKey: @"Name"], [message objectForKey: @"Message"], nil];
|
[message objectForKey: @"Name"], [message objectForKey: @"Message"], nil];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue