Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix naming and errors in logs

  • Loading branch information...
commit 4311d2a4211782c7efb0aa3ad496995ba98978fe 1 parent 8146d5d
Constantine Mureev mureev authored
4 EGODatabaseRequest.m
View
@@ -50,8 +50,8 @@ - (id)initWithQuery:(NSString*)aQuery parameters:(NSArray*)someParameters {
return self;
}
- (void)fire {
- if(self.delegate == nil){
- EGODBDebugLog(@"[EGODatabase] FATAL: please specify the callback delegate");
+ if(self.delegate == nil && self.block == nil){
+ EGODBDebugLog(@"[EGODatabase] FATAL: please specify the callback delegate or block");
return;
}
if(self.database == nil){
4 EGODatabaseRequestBlock.h
View
@@ -8,7 +8,7 @@
#import "EGODatabaseResult.h"
@protocol OperationCallback <NSObject>
-+ (id)callbackWithSuccess:(id)success error:(id)error;
++ (id)blockWithSuccess:(id)success error:(id)error;
@end
@interface OperationCallback : NSObject <OperationCallback> {
@@ -26,7 +26,7 @@ typedef void (^RequestErrorBlock)(NSError *error);
@protocol EGODatabaseRequestBlock <NSObject>
@optional
-+ (id)callbackWithSuccess:(RequestSuccessBlock)success error:(RequestErrorBlock)error;
++ (id)blockWithSuccess:(RequestSuccessBlock)success error:(RequestErrorBlock)error;
@end
@interface EGODatabaseRequestBlock : OperationCallback <EGODatabaseRequestBlock>
2  EGODatabaseRequestBlock.m
View
@@ -15,7 +15,7 @@ @implementation OperationCallback
@synthesize successBlock = _successBlock;
@synthesize errorBlock = _errorBlock;
-+ (id)callbackWithSuccess:(id)success error:(id)error {
++ (id)blockWithSuccess:(id)success error:(id)error {
id callback = [[[self alloc] init] autorelease];
[callback setSuccessBlock:success];
[callback setErrorBlock:error];
Please sign in to comment.
Something went wrong with that request. Please try again.