Skip to content

Commit

Permalink
Merge branch 'feature/743-whitespace-cleanup' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
blakewatters committed May 17, 2012
2 parents ee30436 + 016f13d commit 185874d
Show file tree
Hide file tree
Showing 245 changed files with 3,858 additions and 3,858 deletions.
6 changes: 3 additions & 3 deletions Code/CoreData/CoreData.h
Expand Up @@ -4,13 +4,13 @@
// //
// Created by Blake Watters on 9/30/10. // Created by Blake Watters on 9/30/10.
// Copyright (c) 2009-2012 RestKit. All rights reserved. // Copyright (c) 2009-2012 RestKit. All rights reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
// You may obtain a copy of the License at // You may obtain a copy of the License at
// //
// http://www.apache.org/licenses/LICENSE-2.0 // http://www.apache.org/licenses/LICENSE-2.0
// //
// Unless required by applicable law or agreed to in writing, software // Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, // distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
12 changes: 6 additions & 6 deletions Code/CoreData/NSEntityDescription+RKAdditions.h
Expand Up @@ -18,7 +18,7 @@ extern NSString * const RKEntityDescriptionPrimaryKeyAttributeUserInfoKey;


/** /**
The substitution variable used in predicateForPrimaryKeyAttribute. The substitution variable used in predicateForPrimaryKeyAttribute.
**Value**: @"PRIMARY_KEY_VALUE" **Value**: @"PRIMARY_KEY_VALUE"
@see predicateForPrimaryKeyAttribute @see predicateForPrimaryKeyAttribute
*/ */
Expand Down Expand Up @@ -47,21 +47,21 @@ extern NSString * const RKEntityDescriptionPrimaryKeyAttributeValuePredicateSubs
/** /**
Returns a cached predicate specifying that the primary key attribute is equal to the $PRIMARY_KEY_VALUE Returns a cached predicate specifying that the primary key attribute is equal to the $PRIMARY_KEY_VALUE
substitution variable. substitution variable.
This predicate is cached to avoid parsing overhead during object mapping operations This predicate is cached to avoid parsing overhead during object mapping operations
and must be evaluated using [NSPredicate predicateWithSubstitutionVariables:] and must be evaluated using [NSPredicate predicateWithSubstitutionVariables:]
@return A cached predicate specifying the value of the primary key attribute is equal to the $PRIMARY_KEY_VALUE @return A cached predicate specifying the value of the primary key attribute is equal to the $PRIMARY_KEY_VALUE
substitution variable. substitution variable.
*/ */
- (NSPredicate *)predicateForPrimaryKeyAttribute; - (NSPredicate *)predicateForPrimaryKeyAttribute;


/** /**
Returns a predicate specifying that the value of the primary key attribute is equal to a given Returns a predicate specifying that the value of the primary key attribute is equal to a given
value. This predicate is constructed by evaluating the cached predicate returned by the value. This predicate is constructed by evaluating the cached predicate returned by the
predicateForPrimaryKeyAttribute with a dictionary of substitution variables specifying that predicateForPrimaryKeyAttribute with a dictionary of substitution variables specifying that
$PRIMARY_KEY_VALUE is equal to the given value. $PRIMARY_KEY_VALUE is equal to the given value.
@return A predicate speciying that the value of the primary key attribute is equal to a given value. @return A predicate speciying that the value of the primary key attribute is equal to a given value.
*/ */
- (NSPredicate *)predicateForPrimaryKeyAttributeWithValue:(id)value; - (NSPredicate *)predicateForPrimaryKeyAttributeWithValue:(id)value;
Expand Down
4 changes: 2 additions & 2 deletions Code/CoreData/NSEntityDescription+RKAdditions.m
Expand Up @@ -35,7 +35,7 @@ - (NSString *)primaryKeyAttribute
// Fall back to the userInfo dictionary // Fall back to the userInfo dictionary
if (! primaryKeyAttribute) { if (! primaryKeyAttribute) {
primaryKeyAttribute = [self.userInfo valueForKey:RKEntityDescriptionPrimaryKeyAttributeUserInfoKey]; primaryKeyAttribute = [self.userInfo valueForKey:RKEntityDescriptionPrimaryKeyAttributeUserInfoKey];

// If we have loaded from the user info, ensure we have a predicate // If we have loaded from the user info, ensure we have a predicate
if (! [self predicateForPrimaryKeyAttribute]) { if (! [self predicateForPrimaryKeyAttribute]) {
[self setPredicateForPrimaryKeyAttribute:primaryKeyAttribute]; [self setPredicateForPrimaryKeyAttribute:primaryKeyAttribute];
Expand All @@ -50,7 +50,7 @@ - (void)setPrimaryKeyAttribute:(NSString *)primaryKeyAttribute
objc_setAssociatedObject(self, objc_setAssociatedObject(self,
&primaryKeyAttributeKey, &primaryKeyAttributeKey,
primaryKeyAttribute, primaryKeyAttribute,
OBJC_ASSOCIATION_RETAIN); OBJC_ASSOCIATION_RETAIN);
[self setPredicateForPrimaryKeyAttribute:primaryKeyAttribute]; [self setPredicateForPrimaryKeyAttribute:primaryKeyAttribute];
} }


Expand Down
8 changes: 4 additions & 4 deletions Code/CoreData/NSManagedObject+ActiveRecord.h
Expand Up @@ -28,13 +28,13 @@
@interface NSManagedObject (ActiveRecord) @interface NSManagedObject (ActiveRecord)


/** /**
* The NSEntityDescription for the Subclass * The NSEntityDescription for the Subclass
* defaults to the subclass className, may be overridden * defaults to the subclass className, may be overridden
*/ */
+ (NSEntityDescription*)entity; + (NSEntityDescription*)entity;


/** /**
* Returns an initialized NSFetchRequest for the entity, with no predicate * Returns an initialized NSFetchRequest for the entity, with no predicate
*/ */
+ (NSFetchRequest*)fetchRequest; + (NSFetchRequest*)fetchRequest;


Expand Down Expand Up @@ -94,7 +94,7 @@
+ (NSUInteger)count DEPRECATED_ATTRIBUTE; + (NSUInteger)count DEPRECATED_ATTRIBUTE;


/** /**
* Creates a new managed object and inserts it into the managedObjectContext. * Creates a new managed object and inserts it into the managedObjectContext.
*/ */
+ (id)object; + (id)object;


Expand Down

0 comments on commit 185874d

Please sign in to comment.