Changeset 9542

Timestamp:

Nov 22, 2009, 3:40:19 AM (13 years ago)

Author:

livings124

Message:

in the message window code, create the processed file name/line number right away, to avoid having to store an extra number

File:

• trunk/macosx/MessageWindowController.m (modified) (4 diffs)

trunk/macosx/MessageWindowController.m

@@ -155 +155 @@
                             : [[NSProcessInfo processInfo] processName];
         
+        NSString * file = [NSString stringWithFormat: @"%@:%d", [[NSString stringWithUTF8String: currentMessage->file] lastPathComponent],
+                            currentMessage->line];
+        
         NSDictionary * message  = [NSDictionary dictionaryWithObjectsAndKeys:
                                     [NSString stringWithUTF8String: currentMessage->message], @"Message",
@@ -161 +164 @@
                                     [NSNumber numberWithInteger: currentMessage->level], @"Level",
                                     name, @"Name",
-                                    [NSString stringWithUTF8String: currentMessage->file], @"File",
-                                    [NSNumber numberWithInteger: currentMessage->line], @"Line", nil];
-                                
+                                    file, @"File", nil];
+        
         [fMessages addObject: message];
     }
@@ -246 +248 @@
 {
     NSDictionary * message = [fMessages objectAtIndex: row];
-    return [NSString stringWithFormat: @"%@:%@", [[message objectForKey: @"File"] lastPathComponent], [message objectForKey: @"Line"]];
+    return [message objectForKey: @"File"];
 }
 
@@ -384 +386 @@
     }
     
-    return [NSString stringWithFormat: @"%@ %@:%@ [%@] %@: %@", [message objectForKey: @"Date"],
-            [[message objectForKey: @"File"] lastPathComponent], [message objectForKey: @"Line"], level,
+    return [NSString stringWithFormat: @"%@ %@ [%@] %@: %@", [message objectForKey: @"Date"],
+            [message objectForKey: @"File"], level,
             [message objectForKey: @"Name"], [message objectForKey: @"Message"], nil];
 }