From 9b89af4cf53fc870b67508e1aed4130c9c3d07e5 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Thu, 27 Jun 2013 22:16:02 -0400 Subject: [PATCH] Connect ProtocolClient to the LoggingController. This also removes the error property from LogEntry, since it was always unused. --- English.lproj/Log.xib | 1091 +++++++++--------------------------- Source/LoggingController.h | 4 - Source/LoggingController.m | 2 - Source/NetworkConnection.m | 29 - Source/ProtocolClient.m | 22 +- 5 files changed, 272 insertions(+), 876 deletions(-) diff --git a/English.lproj/Log.xib b/English.lproj/Log.xib index 11f83cc..c8b93a7 100644 --- a/English.lproj/Log.xib +++ b/English.lproj/Log.xib @@ -1,31 +1,39 @@ - 1050 - 10H574 - 804 - 1038.35 - 461.00 + 1080 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 804 + 3084 - + YES - + NSArrayController + NSCustomObject + NSCustomView + NSScrollView + NSScroller + NSSplitView + NSTableColumn + NSTableHeaderView + NSTableView + NSTextField + NSTextFieldCell + NSTextView + NSView + NSWindowTemplate YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -41,12 +49,12 @@ 15 2 - {{196, 23}, {663, 487}} + {{196, 23}, {663, 423}} 544735232 Connection Log NSWindow - {1.79769e+308, 1.79769e+308} + {663, 487} @@ -73,19 +81,24 @@ 256 {663, 153} + + YES + NO + YES 256 {663, 17} + + - - + + -2147483392 {{649, 0}, {16, 17}} - YES @@ -94,7 +107,7 @@ 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Dir. @@ -122,7 +135,7 @@ - 337772096 + 337641536 133120 Text Cell @@ -152,7 +165,7 @@ 40 1000 - 75628096 + 75497536 2048 TXr @@ -163,7 +176,7 @@ - 337772096 + 337641536 133120 Text Cell @@ -180,7 +193,7 @@ 40 1000 - 75628096 + 75497536 2048 TXw @@ -188,7 +201,7 @@ - 337772096 + 337641536 133120 Text Cell @@ -201,11 +214,11 @@ - 287 + 496.42578125 10 3.4028234663852886e+38 - 75628096 + 75497536 2048 Contents @@ -213,32 +226,7 @@ - 337772096 - 133120 - Text Cell - - - - - - 3 - YES - - - - 208 - 10 - 3.4028234663852886e+38 - - 75628096 - 2048 - Error - - - - - - 337772096 + 337641536 133120 Text Cell @@ -264,7 +252,7 @@ 14 - -759169024 + -761266176 LogList @@ -273,10 +261,12 @@ 0 YES 0 + 1 {{1, 17}, {663, 153}} + @@ -287,6 +277,9 @@ -2147483392 {{649, 17}, {15, 208}} + + + NO _doScroller: 0.93273542600896864 @@ -294,13 +287,15 @@ -2147483392 - {{1, 225}, {663, 15}} + {{1, 154}, {663, 16}} + + + NO 1 _doScroller: - 1 - 0.99251497005988021 + 0.99849397590361444 @@ -311,23 +306,26 @@ {{1, 0}, {663, 17}} + 4 - {665, 171} - - 562 + + + 133682 - QSAAAEEgAABBgAAAQYAAAA + 0.25 + 4 + 1 @@ -339,9 +337,11 @@ 268 {{92, 287}, {249, 17}} + + YES - 68288064 + 68157504 272630784 Label @@ -358,15 +358,18 @@ + NO 265 {{553, 288}, {18, 17}} + + YES - 68288064 + 68157504 138413056 / @@ -374,15 +377,18 @@ + NO 265 {{579, 287}, {67, 17}} + + YES - 68288064 + 68157504 138413056 Label @@ -390,29 +396,7 @@ - - - - 290 - {{17, 20}, {629, 53}} - - YES - - 67239424 - 272629760 - Multiline Label - - LucidaGrande - 13 - 16 - - - - - 1 - MSAwIDAAA - - + NO @@ -427,8 +411,10 @@ 2322 - {{0, 1}, {606, 14}} + {621, 196} + + @@ -441,11 +427,11 @@ YES - 134 + 166 - 606 + 621 1 @@ -460,7 +446,7 @@ NSBackgroundColor NSColor - + YES 6 @@ -485,7 +471,7 @@ NSCursor NSUnderline - + YES 1 @@ -499,29 +485,50 @@ + + 1 6 - {1229, 1e+07} - {223, 0} + {1229, 10000000} - {{1, 1}, {606, 196}} + {{1, 1}, {621, 196}} + - {4, -5} - 1 + {4, 5} + + 79691776 + + YES + + YES + + + + file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff + + + + + 3 + MCAwAA + + 4 256 - {{607, 1}, {15, 196}} + {{606, 1}, {16, 196}} + + NO _doScroller: 0.85256409645080566 @@ -531,6 +538,9 @@ -2147483392 {{-100, -100}, {87, 18}} + + + NO 1 _doScroller: @@ -540,20 +550,26 @@ {{20, 81}, {623, 198}} - - 18 + + + 133138 + 0.25 + 4 + 1 265 {{476, 287}, {67, 17}} + + YES - 68288064 + 68157504 138413056 Label @@ -561,15 +577,18 @@ + NO 265 {{343, 287}, {131, 17}} + + YES - 68288064 + 68157504 272630784 Transaction ID s/r: @@ -581,15 +600,18 @@ + NO 268 {{17, 287}, {73, 17}} + + YES - 68288064 + 68157504 272630784 Direction: @@ -597,25 +619,33 @@ + NO {{0, 180}, {665, 308}} + + NSView - {{-1, 0}, {665, 488}} + {{-1, -64}, {665, 488}} + + ConnectionSplitView - {663, 487} + {663, 423} + + - {{0, 0}, {1680, 1028}} + {{0, 0}, {2560, 1418}} {663, 509} - {1.79769e+308, 1.79769e+308} + {10000000000000, 10000000000000} ConnectionLog + YES @@ -650,72 +680,70 @@ 22 - - value: selection.error - - - - - - value: selection.error - value - selection.error - - NSNullPlaceholder - No Error - - 2 - - - 56 - - - - attributedString: selection.contents - + + logEntriesController_ + - - - - attributedString: selection.contents - attributedString - selection.contents - 2 - - 58 + 96 - value: selection.lastWrittenTransactionID - + value: arrangedObjects.lastReadTransactionID + - + - value: selection.lastWrittenTransactionID + value: arrangedObjects.lastReadTransactionID value - selection.lastWrittenTransactionID + arrangedObjects.lastReadTransactionID + + YES + + YES + NSConditionallySetsEditable + NSCreatesSortDescriptor + + + YES + + + + 2 - 84 + 110 - value: selection.lastReadTransactionID - + value: arrangedObjects.lastWrittenTransactionID + - + - value: selection.lastReadTransactionID + value: arrangedObjects.lastWrittenTransactionID value - selection.lastReadTransactionID + arrangedObjects.lastWrittenTransactionID + + YES + + YES + NSConditionallySetsEditable + NSCreatesSortDescriptor + + + YES + + + + 2 - 85 + 107 @@ -735,39 +763,15 @@ - value: selection.directionName - - - - - - value: selection.directionName - value - selection.directionName - 2 - - - 92 - - - - logEntriesController_ - - - - 96 - - - - value: arrangedObjects.lastWrittenTransactionID - + value: arrangedObjects.contents + - + - value: arrangedObjects.lastWrittenTransactionID + value: arrangedObjects.contents value - arrangedObjects.lastWrittenTransactionID + arrangedObjects.contents YES @@ -775,7 +779,7 @@ NSConditionallySetsEditable NSCreatesSortDescriptor - + YES @@ -784,19 +788,19 @@ 2 - 107 + 108 - value: arrangedObjects.contents - + value: arrangedObjects.directionName + - + - value: arrangedObjects.contents + value: arrangedObjects.directionName value - arrangedObjects.contents + arrangedObjects.directionName YES @@ -804,7 +808,7 @@ NSConditionallySetsEditable NSCreatesSortDescriptor - + YES @@ -813,94 +817,71 @@ 2 - 108 + 111 - value: arrangedObjects.error - + value: selection.lastWrittenTransactionID + - + - value: arrangedObjects.error + value: selection.lastWrittenTransactionID value - arrangedObjects.error - - YES - - YES - NSConditionallySetsEditable - NSCreatesSortDescriptor - - - YES - - - - + selection.lastWrittenTransactionID 2 - 109 + 84 - value: arrangedObjects.lastReadTransactionID - + attributedString: selection.contents + - + - value: arrangedObjects.lastReadTransactionID + attributedString: selection.contents + attributedString + selection.contents + 2 + + + 58 + + + + value: selection.lastReadTransactionID + + + + + + value: selection.lastReadTransactionID value - arrangedObjects.lastReadTransactionID - - YES - - YES - NSConditionallySetsEditable - NSCreatesSortDescriptor - - - YES - - - - + selection.lastReadTransactionID 2 - 110 + 85 - value: arrangedObjects.directionName - + value: selection.directionName + - + - value: arrangedObjects.directionName + value: selection.directionName value - arrangedObjects.directionName - - YES - - YES - NSConditionallySetsEditable - NSCreatesSortDescriptor - - - YES - - - - + selection.directionName 2 - 111 + 92 @@ -908,7 +889,9 @@ YES 0 - + + YES + @@ -986,7 +969,6 @@ YES - @@ -1012,15 +994,6 @@ - - 27 - - - YES - - - - 25 @@ -1063,11 +1036,6 @@ - - 28 - - - 30 @@ -1078,7 +1046,6 @@ YES - @@ -1157,20 +1124,6 @@ - - 52 - - - YES - - - - - - 53 - - - 79 @@ -1219,21 +1172,23 @@ YES YES - 1.IBEditorWindowLastContentRect + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency 1.IBPluginDependency - 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect - 1.windowTemplate.hasMinSize - 1.windowTemplate.minSize 10.IBPluginDependency 11.IBPluginDependency 2.IBPluginDependency 23.IBPluginDependency + 25.IBPluginDependency + 26.IBPluginDependency + 29.IBPluginDependency 3.IBPluginDependency + 30.IBPluginDependency 37.CustomClassName + 37.IBPluginDependency 38.IBPluginDependency 39.IBPluginDependency 4.IBPluginDependency @@ -1246,8 +1201,6 @@ 48.IBPluginDependency 49.IBPluginDependency 5.IBPluginDependency - 52.IBPluginDependency - 53.IBPluginDependency 57.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency @@ -1260,27 +1213,27 @@ 9.IBPluginDependency 90.IBPluginDependency - + YES - {{403, 154}, {663, 487}} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{403, 154}, {663, 487}} - {196, 240} - {{202, 428}, {480, 270}} - - {663, 487} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - BSSplitView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + BSSplitView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1307,17 +1260,13 @@ YES - - YES - + YES - - YES - + 111 @@ -1330,7 +1279,7 @@ NSSplitView IBProjectSource - Source/BSSplitView.h + ./Classes/BSSplitView.h @@ -1349,542 +1298,7 @@ IBProjectSource - Source/LoggingController.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSArrayController - NSObjectController - - IBFrameworkSource - AppKit.framework/Headers/NSArrayController.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSManagedObjectContext - NSObject - - IBFrameworkSource - CoreData.framework/Headers/NSManagedObjectContext.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObjectController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSObjectController.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSSplitView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSSplitView.h - - - - NSTableColumn - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableColumn.h - - - - NSTableHeaderView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTableHeaderView.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindowController - NSResponder - - showWindow: - id - - - showWindow: - - showWindow: - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h + ./Classes/LoggingController.h @@ -1893,14 +1307,13 @@ IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 YES - ../MacGDBp.xcodeproj 3 diff --git a/Source/LoggingController.h b/Source/LoggingController.h index b9355f6..5da6be5 100644 --- a/Source/LoggingController.h +++ b/Source/LoggingController.h @@ -56,16 +56,12 @@ typedef enum _LogEntryDirection { // The command that was sent or the response. NSString* contents_; - // Any error information. - NSError* error_; - // The values of the last read and written transaction IDs. NSUInteger lastWrittenTransactionID_; NSUInteger lastReadTransactionID_; } @property (assign) LogEntryDirection direction; @property (copy) NSString* contents; -@property (retain) NSError* error; @property (assign) NSUInteger lastWrittenTransactionID; @property (assign) NSUInteger lastReadTransactionID; diff --git a/Source/LoggingController.m b/Source/LoggingController.m index 1885829..5e1fd84 100644 --- a/Source/LoggingController.m +++ b/Source/LoggingController.m @@ -50,7 +50,6 @@ @synthesize direction = direction_; @synthesize contents = contents_; -@synthesize error = error_; @synthesize lastWrittenTransactionID = lastWrittenTransactionID_; @synthesize lastReadTransactionID = lastReadTransactionID_; @@ -73,7 +72,6 @@ - (void)dealloc { self.contents = nil; - self.error = nil; self.lastWrittenTransactionID = 0; self.lastReadTransactionID = 0; [super dealloc]; diff --git a/Source/NetworkConnection.m b/Source/NetworkConnection.m index 8d38a70..b1cfa0d 100644 --- a/Source/NetworkConnection.m +++ b/Source/NetworkConnection.m @@ -16,9 +16,6 @@ #import "NetworkConnection.h" -#import "AppDelegate.h" -#import "LoggingController.h" - // This is the private interface for the NetworkConnection class. This is shared // by the C++ NetworkCallbackController to communicate. @interface NetworkConnection (Private) @@ -27,8 +24,6 @@ // Threadsafe wrappers for the delegate's methods. - (void)errorEncountered:(NSString*)error; -- (LogEntry*)recordSend:(NSString*)command; -- (LogEntry*)recordReceive:(NSString*)command; @end @@ -125,30 +120,6 @@ waitUntilDone:NO]; } -- (LogEntry*)recordSend:(NSString*)command -{ - LoggingController* logger = [[AppDelegate instance] loggingController]; - LogEntry* entry = [LogEntry newSendEntry:command]; - entry.lastReadTransactionID = _lastReadID; - entry.lastWrittenTransactionID = _lastWrittenID; - [logger performSelectorOnMainThread:@selector(recordEntry:) - withObject:entry - waitUntilDone:NO]; - return [entry autorelease]; -} - -- (LogEntry*)recordReceive:(NSString*)command -{ - LoggingController* logger = [[AppDelegate instance] loggingController]; - LogEntry* entry = [LogEntry newReceiveEntry:command]; - entry.lastReadTransactionID = _lastReadID; - entry.lastWrittenTransactionID = _lastWrittenID; - [logger performSelectorOnMainThread:@selector(recordEntry:) - withObject:entry - waitUntilDone:NO]; - return [entry autorelease]; -} - - (void)handleResponse:(NSXMLDocument*)response { // Check and see if there's an error. diff --git a/Source/ProtocolClient.m b/Source/ProtocolClient.m index 4ae1892..9fe62cb 100644 --- a/Source/ProtocolClient.m +++ b/Source/ProtocolClient.m @@ -16,6 +16,9 @@ #import "ProtocolClient.h" +#import "AppDelegate.h" +#import "LoggingController.h" + @implementation ProtocolClient - (id)initWithDelegate:(NSObject*)delegate { @@ -120,15 +123,29 @@ } // Callback for when a message has been sent. -- (void)messageQueue:(MessageQueue*)queue didSendMessage:(NSString*)message { +- (void)messageQueue:(MessageQueue*)queue didSendMessage:(NSString*)message +{ NSInteger tag = [self transactionIDFromCommand:message]; [_lock lock]; _lastWrittenID = tag; [_lock unlock]; + + LoggingController* logger = [[AppDelegate instance] loggingController]; + LogEntry* entry = [LogEntry newSendEntry:message]; + entry.lastReadTransactionID = _lastReadID; + entry.lastWrittenTransactionID = _lastWrittenID; + [logger recordEntry:entry]; } // Callback with the message content when one has been receieved. -- (void)messageQueue:(MessageQueue*)queue didReceiveMessage:(NSString*)message { +- (void)messageQueue:(MessageQueue*)queue didReceiveMessage:(NSString*)message +{ + LoggingController* logger = [[AppDelegate instance] loggingController]; + LogEntry* entry = [LogEntry newReceiveEntry:message]; + entry.lastReadTransactionID = _lastReadID; + entry.lastWrittenTransactionID = _lastWrittenID; + [logger recordEntry:entry]; + // Test if we can convert it into an NSXMLDocument. NSError* error = nil; NSXMLDocument* xml = [[NSXMLDocument alloc] initWithXMLString:message @@ -152,6 +169,7 @@ } _lastReadID = transaction; + entry.lastReadTransactionID = _lastReadID; [_delegate debuggerEngine:self receivedMessage:xml]; } -- 2.22.5