kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-24 04:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress

Browse Source 
Conflicts:
	Code/CoreData/RKManagedObjectLoader.h
	Code/CoreData/RKManagedObjectLoader.m
	Code/CoreData/RKManagedObjectMapping.m
	Code/CoreData/RKManagedObjectMappingOperation.m
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKManagedObjectThreadSafeInvocation.h
	Code/CoreData/RKManagedObjectThreadSafeInvocation.m
	Code/CoreData/RKSearchableManagedObject.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectMapper.h
	Code/ObjectMapping/RKObjectMappingOperation.m
	RestKit.xcodeproj/project.pbxproj
	Tests/Logic/CoreData/RKManagedObjectThreadSafeInvocationTest.m
This commit is contained in:
Blake Watters
2012-07-13 13:07:42 -04:00
parent 87797780a4
commit f0706dbdbf
47 changed files with 1610 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Code/CoreData/RKManagedObjectStore.h
View File

@@ -19,7 +19,7 @@
//
#import <CoreData/CoreData.h>
#import "RKManagedObjectMapping.h"
#import "RKEntityMapping.h"
#import "RKManagedObjectCaching.h"
@class RKManagedObjectStore;
@@ -155,12 +155,15 @@ extern NSString * const RKManagedObjectStoreDidFailSaveNotification;
Retrieves the Managed Object Context for the main thread that was initialized when
the object store was created.
*/
@property (nonatomic, retain, readonly) NSManagedObjectContext *mainQueueManagedObjectContext;
@property (nonatomic, retain, readonly) NSManagedObjectContext *primaryManagedObjectContext;
/**
Instantiates a new managed object context
@bug Deprecated in v0.11.0
*/
- (NSManagedObjectContext *)newManagedObjectContext;
- (NSManagedObjectContext *)newManagedObjectContext DEPRECATED_ATTRIBUTE;
/*
* This returns an appropriate managed object context for this object store.