@@ -19,22 +19,23 @@ #include #import "OFHTTPRequestFailedException.h" #import "OFString.h" #import "OFHTTPRequest.h" +#import "OFHTTPRequestReply.h" #import "autorelease.h" #import "common.h" @implementation OFHTTPRequestFailedException + (instancetype)exceptionWithClass: (Class)class_ request: (OFHTTPRequest*)request - result: (OFHTTPRequestResult*)result + reply: (OFHTTPRequestReply*)reply { return [[[self alloc] initWithClass: class_ request: request - result: result] autorelease]; + reply: reply] autorelease]; } - initWithClass: (Class)class_ { @try { @@ -46,24 +47,24 @@ } } - initWithClass: (Class)class_ request: (OFHTTPRequest*)request_ - result: (OFHTTPRequestResult*)result_ + reply: (OFHTTPRequestReply*)reply_ { self = [super initWithClass: class_]; request = [request_ retain]; - result = [result_ retain]; + reply = [reply_ retain]; return self; } - (void)dealloc { [request release]; - [result release]; + [reply release]; [super dealloc]; } - (OFString*)description @@ -88,11 +89,11 @@ pool = objc_autoreleasePoolPush(); description = [[OFString alloc] initWithFormat: @"A HTTP %s request in class %@ with URL %@ failed with code %d", - type, inClass, [request URL], [result statusCode]]; + type, inClass, [request URL], [reply statusCode]]; objc_autoreleasePoolPop(pool); return description; } @@ -100,10 +101,10 @@ - (OFHTTPRequest*)request { OF_GETTER(request, NO) } -- (OFHTTPRequestResult*)result +- (OFHTTPRequestReply*)reply { - OF_GETTER(result, NO) + OF_GETTER(reply, NO) } @end