From 2cf60ffb863fd0aeeae9e1d1ead86fa54e5e415e Mon Sep 17 00:00:00 2001 From: Jawwad Ahmad Date: Sun, 3 Jun 2012 22:49:03 -0400 Subject: [PATCH] Fix a few spacing issues. Refs #614 --- Code/CoreData/NSManagedObject+ActiveRecord.m | 2 +- Code/Network/RKOAuthClient.m | 10 +++++----- Code/Network/RKRequest.m | 2 +- Code/ObjectMapping/RKObjectMappingOperation.m | 2 +- .../RKObjectMappingProviderContextEntry.m | 2 +- Code/Support/RKDotNetDateFormatter.m | 2 +- Code/Support/RKPathMatcher.m | 2 +- Code/UI/RKFormSection.m | 10 +++++----- Tests/Application/UI/RKTableControllerTest.m | 2 +- Tests/Logic/Network/RKOAuthClientTest.m | 4 ++-- Tests/Logic/Network/RKRequestQueueTest.m | 10 +++++----- Tests/Logic/Support/RKXMLParserTest.m | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Code/CoreData/NSManagedObject+ActiveRecord.m b/Code/CoreData/NSManagedObject+ActiveRecord.m index 611aa698..1f047650 100644 --- a/Code/CoreData/NSManagedObject+ActiveRecord.m +++ b/Code/CoreData/NSManagedObject+ActiveRecord.m @@ -457,7 +457,7 @@ RK_FIX_CATEGORY_BUG(NSManagedObject_ActiveRecord) [request setIncludesSubentities:NO]; [request setFetchBatchSize:[self defaultBatchSize]]; - if (sortTerm != nil){ + if (sortTerm != nil) { NSSortDescriptor *sortBy = [[NSSortDescriptor alloc] initWithKey:sortTerm ascending:ascending]; [request setSortDescriptors:[NSArray arrayWithObject:sortBy]]; [sortBy release]; diff --git a/Code/Network/RKOAuthClient.m b/Code/Network/RKOAuthClient.m index 7642f4d9..db9da90a 100644 --- a/Code/Network/RKOAuthClient.m +++ b/Code/Network/RKOAuthClient.m @@ -96,19 +96,19 @@ if ([errorResponse isEqualToString:@"invalid_grant"]) { errorCode = RKOAuthClientErrorInvalidGrant; } - else if([errorResponse isEqualToString:@"unauthorized_client"]){ + else if ([errorResponse isEqualToString:@"unauthorized_client"]) { errorCode = RKOAuthClientErrorUnauthorizedClient; } - else if([errorResponse isEqualToString:@"invalid_client"]){ + else if ([errorResponse isEqualToString:@"invalid_client"]) { errorCode = RKOAuthClientErrorInvalidClient; } - else if([errorResponse isEqualToString:@"invalid_request"]){ + else if ([errorResponse isEqualToString:@"invalid_request"]) { errorCode = RKOAuthClientErrorInvalidRequest; } - else if([errorResponse isEqualToString:@"unsupported_grant_type"]){ + else if ([errorResponse isEqualToString:@"unsupported_grant_type"]) { errorCode = RKOAuthClientErrorUnsupportedGrantType; } - else if([errorResponse isEqualToString:@"invalid_scope"]){ + else if ([errorResponse isEqualToString:@"invalid_scope"]) { errorCode = RKOAuthClientErrorInvalidScope; } diff --git a/Code/Network/RKRequest.m b/Code/Network/RKRequest.m index 3cd10896..44e36627 100644 --- a/Code/Network/RKRequest.m +++ b/Code/Network/RKRequest.m @@ -330,7 +330,7 @@ RKRequestMethod RKRequestMethodTypeFromName(NSString *methodName) { // Add OAuth headers if necessary // OAuth 1 - if(self.authenticationType == RKRequestAuthenticationTypeOAuth1){ + if (self.authenticationType == RKRequestAuthenticationTypeOAuth1) { NSURLRequest *echo = nil; // use the suitable parameters dict diff --git a/Code/ObjectMapping/RKObjectMappingOperation.m b/Code/ObjectMapping/RKObjectMappingOperation.m index b81e8bb5..a7d76418 100644 --- a/Code/ObjectMapping/RKObjectMappingOperation.m +++ b/Code/ObjectMapping/RKObjectMappingOperation.m @@ -57,7 +57,7 @@ BOOL RKObjectIsValueEqualToValue(id sourceValue, id destinationValue) { // Comparison magic using function pointers. See this page for details: http://www.red-sweater.com/blog/320/abusing-objective-c-with-class // Original code courtesy of Greg Parker // This is necessary because isEqualToNumber will return negative integer values that aren't coercable directly to BOOL's without help [sbw] - BOOL (*ComparisonSender)(id, SEL, id) = (BOOL (*)(id, SEL, id)) objc_msgSend; + BOOL (*ComparisonSender)(id, SEL, id) = (BOOL (*)(id, SEL, id))objc_msgSend; return ComparisonSender(sourceValue, comparisonSelector, destinationValue); } diff --git a/Code/ObjectMapping/RKObjectMappingProviderContextEntry.m b/Code/ObjectMapping/RKObjectMappingProviderContextEntry.m index da328f18..c7d3d4fc 100644 --- a/Code/ObjectMapping/RKObjectMappingProviderContextEntry.m +++ b/Code/ObjectMapping/RKObjectMappingProviderContextEntry.m @@ -41,7 +41,7 @@ - (NSUInteger)hash { int prime = 31; int result = 1; - result = prime * [self.userData hash]? [self.mapping hash] : [self.userData hash]; + result = prime * [self.userData hash] ? [self.mapping hash] : [self.userData hash]; return result; } diff --git a/Code/Support/RKDotNetDateFormatter.m b/Code/Support/RKDotNetDateFormatter.m index 20685ef0..e35d04ff 100644 --- a/Code/Support/RKDotNetDateFormatter.m +++ b/Code/Support/RKDotNetDateFormatter.m @@ -27,7 +27,7 @@ BOOL isValidRange(NSRange rangeOfMatch); NSTimeInterval secondsFromMilliseconds(NSTimeInterval millisecs); NSTimeInterval millisecondsFromSeconds(NSTimeInterval seconds); -@interface RKDotNetDateFormatter() +@interface RKDotNetDateFormatter () - (NSString *)millisecondsFromString:(NSString *)string; @end diff --git a/Code/Support/RKPathMatcher.m b/Code/Support/RKPathMatcher.m index 4726f499..3629e922 100755 --- a/Code/Support/RKPathMatcher.m +++ b/Code/Support/RKPathMatcher.m @@ -54,7 +54,7 @@ NSString *RKEncodeURLString(NSString *unencodedString) { return [encodedString autorelease]; } -@interface RKPathMatcher() +@interface RKPathMatcher () @property (nonatomic,retain) SOCPattern *socPattern; @property (nonatomic,copy) NSString *sourcePath; @property (nonatomic,copy) NSString *rootPath; diff --git a/Code/UI/RKFormSection.m b/Code/UI/RKFormSection.m index 234b3174..d059b979 100644 --- a/Code/UI/RKFormSection.m +++ b/Code/UI/RKFormSection.m @@ -62,15 +62,15 @@ break; case RKFormControlTypeSwitch:; - control = [(UIControl *) [UISwitch new] autorelease]; + control = [(UIControl *)[UISwitch new] autorelease]; break; case RKFormControlTypeSlider:; - control = [(UIControl *) [UISlider new] autorelease]; + control = [(UIControl *)[UISlider new] autorelease]; break; case RKFormControlTypeLabel:; - control = [(UIControl *) [UILabel new] autorelease]; + control = [(UIControl *)[UILabel new] autorelease]; break; case RKFormControlTypeUnknown: @@ -87,9 +87,9 @@ [control isKindOfClass:[UILabel class]]) { return @"text"; } else if ([control isKindOfClass:[UISwitch class]]) { - return @"on"; + return @"on"; } else if ([control isKindOfClass:[UISlider class]]) { - return @"value"; + return @"value"; } else { [NSException raise:NSInvalidArgumentException format:@"*** -[%@ %@]: unable to define mapping for control type %@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSStringFromClass([control class])]; } diff --git a/Tests/Application/UI/RKTableControllerTest.m b/Tests/Application/UI/RKTableControllerTest.m index 4b506581..8db784a8 100644 --- a/Tests/Application/UI/RKTableControllerTest.m +++ b/Tests/Application/UI/RKTableControllerTest.m @@ -1821,7 +1821,7 @@ }; }]]; NSIndexPath* delegateIndexPath = [tableController tableView:tableController.tableView - targetIndexPathForMoveFromRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]toProposedIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]]; + targetIndexPathForMoveFromRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] toProposedIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]]; assertThat(delegateIndexPath, is(equalTo(moveToIndexPath))); } diff --git a/Tests/Logic/Network/RKOAuthClientTest.m b/Tests/Logic/Network/RKOAuthClientTest.m index ba88dd12..c67aeb51 100644 --- a/Tests/Logic/Network/RKOAuthClientTest.m +++ b/Tests/Logic/Network/RKOAuthClientTest.m @@ -43,7 +43,7 @@ return [portCheck isOpen]; } -- (void)testShouldGetAccessToken{ +- (void)testShouldGetAccessToken { RKOAuthClientTestSkipWithoutMongoDB(); RKTestResponseLoader *loader = [RKTestResponseLoader responseLoader]; @@ -68,7 +68,7 @@ assertThatBool(loader.wasSuccessful, is(equalToBool(NO))); } -- (void)testShouldGetProtectedResource{ +- (void)testShouldGetProtectedResource { RKOAuthClientTestSkipWithoutMongoDB(); //TODO: Encapsulate this code in a correct manner diff --git a/Tests/Logic/Network/RKRequestQueueTest.m b/Tests/Logic/Network/RKRequestQueueTest.m index 89c7613f..9c7b7f30 100644 --- a/Tests/Logic/Network/RKRequestQueueTest.m +++ b/Tests/Logic/Network/RKRequestQueueTest.m @@ -80,7 +80,7 @@ queue.suspended = NO; OCMockObject* delegateMock = [OCMockObject niceMockForProtocol:@protocol(RKRequestQueueDelegate)]; [[delegateMock expect] requestQueueWasSuspended:queue]; - queue.delegate = (NSObject*) delegateMock; + queue.delegate = (NSObject*)delegateMock; queue.suspended = YES; [delegateMock verify]; [queue release]; @@ -91,7 +91,7 @@ assertThatBool(queue.suspended, is(equalToBool(YES))); OCMockObject* delegateMock = [OCMockObject niceMockForProtocol:@protocol(RKRequestQueueDelegate)]; [[delegateMock expect] requestQueueWasUnsuspended:queue]; - queue.delegate = (NSObject*) delegateMock; + queue.delegate = (NSObject*)delegateMock; queue.suspended = NO; [delegateMock verify]; [queue release]; @@ -101,7 +101,7 @@ RKRequestQueue* queue = [RKRequestQueue new]; OCMockObject* delegateMock = [OCMockObject niceMockForProtocol:@protocol(RKRequestQueueDelegate)]; [[delegateMock expect] requestQueueDidBeginLoading:queue]; - queue.delegate = (NSObject*) delegateMock; + queue.delegate = (NSObject*)delegateMock; NSURL* URL = [RKTestFactory baseURL]; RKRequest* request = [[RKRequest alloc] initWithURL:URL]; [queue addLoadingRequest:request]; @@ -113,7 +113,7 @@ RKRequestQueue* queue = [RKRequestQueue new]; OCMockObject* delegateMock = [OCMockObject niceMockForProtocol:@protocol(RKRequestQueueDelegate)]; [[delegateMock expect] requestQueueDidFinishLoading:queue]; - queue.delegate = (NSObject*) delegateMock; + queue.delegate = (NSObject*)delegateMock; NSURL* URL = [RKTestFactory baseURL]; RKRequest* request = [[RKRequest alloc] initWithURL:URL]; [queue addLoadingRequest:request]; @@ -132,7 +132,7 @@ request.delegate = loader; RKRequestQueue* queue = [RKRequestQueue new]; - queue.delegate = (NSObject*) delegateMock; + queue.delegate = (NSObject*)delegateMock; [[delegateMock expect] requestQueueDidFinishLoading:queue]; [queue addRequest:request]; [queue start]; diff --git a/Tests/Logic/Support/RKXMLParserTest.m b/Tests/Logic/Support/RKXMLParserTest.m index d7a5b5e1..a5bceff3 100644 --- a/Tests/Logic/Support/RKXMLParserTest.m +++ b/Tests/Logic/Support/RKXMLParserTest.m @@ -71,7 +71,7 @@ assertThatInt([[[result1 valueForKeyPath:@"number"] valueForKey:@"text"] intValue], is(equalToInt(1))); assertThat([result1 valueForKeyPath:@"string"], is(equalTo(@"string"))); id result2 = [records objectAtIndex:1]; - assertThatInt([[[result2 valueForKeyPath:@"another-number"] valueForKey:@"text"]intValue], is(equalToInt(1))); + assertThatInt([[[result2 valueForKeyPath:@"another-number"] valueForKey:@"text"] intValue], is(equalToInt(1))); } - (void)testShouldMapXML {