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

Cleaned up API changes for Three20 support

Browse Source
This commit is contained in:
Blake Watters
2010-07-20 15:53:06 -04:00
parent 878a2a5e69
commit 6e9a10be20
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Code/Three20/RKRequestModel.m
View File

@@ -135,7 +135,7 @@
[_delegate rkModelDidStartLoad];
}
_objects = [[RKManagedModel objectsWithRequest:_fetchRequest] retain];
_objects = [[RKManagedObject objectsWithRequest:_fetchRequest] retain];
_loaded = YES;
if ([_delegate respondsToSelector:@selector(rkModelDidFinishLoad)]) {
@@ -178,7 +178,7 @@
- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
// Go Offline button
if (1 == buttonIndex) {
[[RKModelManager manager] goOffline];
[[RKResourceManager manager] goOffline];
}
}
@@ -198,11 +198,11 @@
// RKModelLoaderDelegate
// This callback is invoked after the request has been fully serviced. Finish the load here.
- (void)modelLoaderRequest:(RKRequest*)request didLoadModels:(NSArray*)models response:(RKResponse*)response modelObject:(id<RKModelMappable>)modelObject {
[self modelsDidLoad:models];
- (void)resourceLoadRequest:(RKRequest *)request didLoadObjects:(NSArray *)objects response:(RKResponse *)response object:(id<RKResourceMappable>)object {
[self modelsDidLoad:objects];
}
- (void)modelLoaderRequest:(RKRequest*)request didFailWithError:(NSError*)error response:(RKResponse*)response modelObject:(id<RKModelMappable>)modelObject {
- (void)resourceLoadRequest:(RKRequest*)request didFailWithError:(NSError*)error response:(RKResponse*)response object:(id<RKResourceMappable>)object {
if ([self errorWarrantsOptionToGoOffline:error]) {
[self showAlertWithOptionToGoOfflineForError:error];
} else {
@@ -225,9 +225,9 @@
- (void)load {
if (_params) {
_loadingRequest = [[RKModelManager manager] loadModels:_resourcePath fetchRequest:_fetchRequest method:_method params:_params delegate:self];
_loadingRequest = [[RKResourceManager manager] loadResource:_resourcePath fetchRequest:_fetchRequest method:_method params:_params delegate:self];
} else {
_loadingRequest = [[RKModelManager manager] loadModels:_resourcePath fetchRequest:_fetchRequest method:_method delegate:self];
_loadingRequest = [[RKResourceManager manager] loadResource:_resourcePath fetchRequest:_fetchRequest method:_method delegate:self];
}
}

4
RestKit.xcodeproj/project.pbxproj
View File

@@ -1262,7 +1262,7 @@
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = RestKit_Prefix.pch;
GCC_PREFIX_HEADER = Code/RestKit_Prefix.pch;
HEADER_SEARCH_PATHS = (
../three20/Build/Products/three20,
Code,
@@ -1289,7 +1289,7 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = RestKit_Prefix.pch;
GCC_PREFIX_HEADER = Code/RestKit_Prefix.pch;
HEADER_SEARCH_PATHS = (
../three20/Build/Products/three20,
Code,