From 1c1e0721593375bfc8fe991d329c5ad46a9c2573 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 7 Dec 2015 01:04:38 -0500 Subject: [PATCH] Remove DebuggerBackEnd.status. --- Source/DebuggerBackEnd.h | 3 --- Source/DebuggerBackEnd.m | 17 ++++++----------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Source/DebuggerBackEnd.h b/Source/DebuggerBackEnd.h index 4a7178a..a0e8186 100644 --- a/Source/DebuggerBackEnd.h +++ b/Source/DebuggerBackEnd.h @@ -33,9 +33,6 @@ // a new frame is created or the stack should be destroyed. @interface DebuggerBackEnd : NSObject -// Human-readable status of the connection. -@property(readonly, copy, nonatomic) NSString* status; - // Whether the debugger should detach immediately after being contacted by the // backend. YES means all debugger connections will be dropped. @property(assign, nonatomic) BOOL autoAttach; diff --git a/Source/DebuggerBackEnd.m b/Source/DebuggerBackEnd.m index ec9ba08..9c8e8f6 100644 --- a/Source/DebuggerBackEnd.m +++ b/Source/DebuggerBackEnd.m @@ -21,10 +21,6 @@ #import "modp_b64.h" #import "NSXMLElementAdditions.h" -@interface DebuggerBackEnd () -@property(readwrite, copy, nonatomic) NSString* status; -@end - @implementation DebuggerBackEnd { // The connection to the debugger engine. NSUInteger _port; @@ -34,7 +30,6 @@ BOOL _active; } -@synthesize status = _status; @synthesize autoAttach = _autoAttach; @synthesize model = _model; @@ -136,7 +131,7 @@ - (void)stop { [_client disconnect]; _active = NO; - self.status = @"Stopped"; + self.model.status = @"Stopped"; } /** @@ -145,7 +140,7 @@ - (void)detach { [_client sendCommandWithFormat:@"detach"]; _active = NO; - self.status = @"Stopped"; + self.model.status = @"Stopped"; } - (void)loadStackFrame:(StackFrame*)frame { @@ -316,13 +311,13 @@ * Receiver for status updates. This just freshens up the UI. */ - (void)updateStatus:(NSXMLDocument*)response { - self.status = [[[[response rootElement] attributeForName:@"status"] stringValue] capitalizedString]; - self.model.status = self.status; + NSString* status = [[[[response rootElement] attributeForName:@"status"] stringValue] capitalizedString]; + self.model.status = status; _active = YES; - if (!_status || [_status isEqualToString:@"Stopped"]) { + if (!status || [status isEqualToString:@"Stopped"]) { [_model onDisconnect]; _active = NO; - } else if ([_status isEqualToString:@"Stopping"]) { + } else if ([status isEqualToString:@"Stopping"]) { [_client sendCommandWithFormat:@"stop"]; _active = NO; } -- 2.22.5