Overview
Comment: | OFHTTPRequestFailedException: Naming consistency |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
991ced53332ba1159878f008247dc349 |
User & Date: | js on 2012-10-02 11:05:17 |
Other Links: | manifest | tags |
Context
2012-10-02
| ||
11:20 | More property cleanup. check-in: 7261ba5bd1 user: js tags: trunk | |
11:05 | OFHTTPRequestFailedException: Naming consistency check-in: 991ced5333 user: js tags: trunk | |
11:00 | Clean up properties in exceptions. check-in: c7adbcf399 user: js tags: trunk | |
Changes
Modified src/OFDataArray.m from [0d47039615] to [1e6261bd38].
︙ | ︙ | |||
149 150 151 152 153 154 155 | request = [OFHTTPRequest requestWithURL: URL]; result = [request perform]; if ([result statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] | | | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | request = [OFHTTPRequest requestWithURL: URL]; result = [request perform]; if ([result statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] request: request result: result]; self = [[result data] retain]; objc_autoreleasePoolPop(pool); return self; } |
︙ | ︙ |
Modified src/OFHTTPRequest.m from [4435d73c99] to [b8e1935f38].
︙ | ︙ | |||
519 520 521 522 523 524 525 | case 303: case 307: break; default: [result autorelease]; @throw [OFHTTPRequestFailedException exceptionWithClass: [self class] | | | 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | case 303: case 307: break; default: [result autorelease]; @throw [OFHTTPRequestFailedException exceptionWithClass: [self class] request: self result: result]; } objc_autoreleasePoolPop(pool); return [result autorelease]; } |
︙ | ︙ |
Modified src/OFString.m from [113cc54e20] to [813606e445].
︙ | ︙ | |||
910 911 912 913 914 915 916 | request = [OFHTTPRequest requestWithURL: URL]; result = [request perform]; if ([result statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] | | | 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 | request = [OFHTTPRequest requestWithURL: URL]; result = [request perform]; if ([result statusCode] != 200) @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] request: request result: result]; if (encoding == OF_STRING_ENCODING_AUTODETECT && (contentType = [[result headers] objectForKey: @"Content-Type"])) { contentType = [contentType lowercaseString]; if ([contentType hasSuffix: @"charset=utf-8"]) |
︙ | ︙ |
Modified src/exceptions/OFHTTPRequestFailedException.h from [5339810eef] to [3e49458f2b].
︙ | ︙ | |||
20 21 22 23 24 25 26 | @class OFHTTPRequestResult; /** * \brief An exception indicating that a HTTP request failed. */ @interface OFHTTPRequestFailedException: OFException { | | | | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | @class OFHTTPRequestResult; /** * \brief An exception indicating that a HTTP request failed. */ @interface OFHTTPRequestFailedException: OFException { OFHTTPRequest *request; OFHTTPRequestResult *result; } #ifdef OF_HAVE_PROPERTIES @property (readonly, retain, nonatomic) OFHTTPRequest *request; @property (readonly, retain, nonatomic) OFHTTPRequestResult *result; #endif /** * \param class_ The class of the object which caused the exception * \param request The HTTP request which failed * \param result The result of the failed HTTP request * \return A new HTTP request failed exception */ + exceptionWithClass: (Class)class_ request: (OFHTTPRequest*)request result: (OFHTTPRequestResult*)result; /** * Initializes an already allocated HTTP request failed exception * * \param class_ The class of the object which caused the exception * \param request The HTTP request which failed * \param result The result of the failed HTTP request * \return A new HTTP request failed exception */ - initWithClass: (Class)class_ request: (OFHTTPRequest*)request result: (OFHTTPRequestResult*)result; /** * \return The HTTP request which failed */ - (OFHTTPRequest*)request; /** * \return The result of the failed HTTP request */ - (OFHTTPRequestResult*)result; @end |
Modified src/exceptions/OFHTTPRequestFailedException.m from [0f9a027bed] to [562128a903].
︙ | ︙ | |||
22 23 24 25 26 27 28 | #import "OFNotImplementedException.h" #import "autorelease.h" @implementation OFHTTPRequestFailedException + exceptionWithClass: (Class)class_ | | | | | | | | | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | #import "OFNotImplementedException.h" #import "autorelease.h" @implementation OFHTTPRequestFailedException + exceptionWithClass: (Class)class_ request: (OFHTTPRequest*)request result: (OFHTTPRequestResult*)result { return [[[self alloc] initWithClass: class_ request: request result: result] autorelease]; } - initWithClass: (Class)class_ { Class c = [self class]; [self release]; @throw [OFNotImplementedException exceptionWithClass: c selector: _cmd]; } - initWithClass: (Class)class_ request: (OFHTTPRequest*)request_ result: (OFHTTPRequestResult*)result_ { self = [super initWithClass: class_]; request = [request_ retain]; result = [result_ retain]; return self; } - (void)dealloc { [request release]; [result release]; [super dealloc]; } - (OFString*)description { void *pool; const char *type = "(unknown)"; if (description != nil) return description; switch ([request requestType]) { case OF_HTTP_REQUEST_TYPE_GET: type = "GET"; break; case OF_HTTP_REQUEST_TYPE_HEAD: type = "HEAD"; break; case OF_HTTP_REQUEST_TYPE_POST: type = "POST"; break; } 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]]; objc_autoreleasePoolPop(pool); return description; } - (OFHTTPRequest*)request { OF_GETTER(request, NO) } - (OFHTTPRequestResult*)result { OF_GETTER(result, NO) } @end |