不要になったメソッドを削除

diff --git a/KCD/HMCompositCommand.m b/KCD/HMCompositCommand.m
index 12392d7..1673f16 100644 (file)
--- a/KCD/HMCompositCommand.m
+++ b/KCD/HMCompositCommand.m
@@ -63,18 +63,6 @@
                [command setApi:api];
        }
 }
-- (void)setArgumentsString:(NSString *)argumentsString
-{
-       for(id command in self.commands) {
-               [command setArgumentsString:argumentsString];
-       }
-}
-- (void)setJsonData:(NSData *)jsonData
-{
-       for(id command in self.commands) {
-               [command setJsonData:jsonData];
-       }
-}
 - (void)setRecieveDate:(NSDate *)recieveDate
 {
        for(id command in self.commands) {

diff --git a/KCD/HMJSONCommand.h b/KCD/HMJSONCommand.h
index 2589877..a456027 100644 (file)
--- a/KCD/HMJSONCommand.h
+++ b/KCD/HMJSONCommand.h
@@ -13,7 +13,6 @@
 
 @interface HMJSONCommand : NSObject
 
-+ (HMJSONCommand *)commandForAPI:(NSString *)api;
 + (HMJSONCommand *)commandForAPIResult:(HMAPIResult *)apiResult;
 
 @property (copy) NSString *argumentsString;

diff --git a/KCD/HMJSONCommand.m b/KCD/HMJSONCommand.m
index 694c172..50489cb 100644 (file)
--- a/KCD/HMJSONCommand.m
+++ b/KCD/HMJSONCommand.m
@@ -42,63 +42,37 @@ static NSMutableArray *registeredCommands = nil;
        });
 }
 
-+ (HMJSONCommand *)commandForAPI:(NSString *)api
++ (HMJSONCommand *)commandForAPIResult:(HMAPIResult *)apiResult
 {
-       for(Class commandClass in registeredCommands) {
-               if([commandClass canExcuteAPI:api]) {
-                       HMJSONCommand *command =  [commandClass new];
-                       command.api = api;
-#if ENABLE_JSON_LOG_HANDLED_API
-                       HMJSONViewCommand *viewCommand = [HMJSONViewCommand new];
-                       viewCommand.api = api;
-                       command = [HMCompositCommand compositCommandWithCommands:command, viewCommand, nil];
-#endif
-                       return command;
-               }
-       }
+       HMJSONCommand *command = nil;
+       
 #if ENABLE_JSON_LOG
        HMJSONViewCommand *viewCommand = [HMJSONViewCommand new];
-       viewCommand.api = api;
-       return viewCommand;
+       viewCommand.api = apiResult.api;
+       viewCommand.arguments = apiResult.parameter;
+       viewCommand.json = apiResult.json;
+       viewCommand.argumentArray = apiResult.argumentArray;
+       viewCommand.jsonTree = @[[HMJSONNode nodeWithJSON:apiResult.json]];
+       viewCommand.recieveDate = apiResult.date;
+       
+       command = viewCommand;
 #endif
        
-       return nil;
-}
-+ (HMJSONCommand *)commandForAPIResult:(HMAPIResult *)apiResult
-{
        for(Class commandClass in registeredCommands) {
                if([commandClass canExcuteAPI:apiResult.api]) {
-                       HMJSONCommand *command =  [commandClass new];
+                       command =  [commandClass new];
                        command.api = apiResult.api;
                        command.arguments = apiResult.parameter;
                        command.json = apiResult.json;
                        
 #if ENABLE_JSON_LOG_HANDLED_API
-                       HMJSONViewCommand *viewCommand = [HMJSONViewCommand new];
-                       viewCommand.api = apiResult.api;
-                       viewCommand.arguments = apiResult.parameter;
-                       viewCommand.json = apiResult.json;
-                       viewCommand.argumentArray = apiResult.argumentArray;
-                       viewCommand.jsonTree = @[[HMJSONNode nodeWithJSON:apiResult.json]];
-                       viewCommand.recieveDate = apiResult.date;
-                       
                        command = [HMCompositCommand compositCommandWithCommands:command, viewCommand, nil];
 #endif
                        return command;
                }
        }
-#if ENABLE_JSON_LOG
-       HMJSONViewCommand *viewCommand = [HMJSONViewCommand new];
-       viewCommand.api = apiResult.api;
-       viewCommand.arguments = apiResult.parameter;
-       viewCommand.json = apiResult.json;
-       viewCommand.argumentArray = apiResult.argumentArray;
-       viewCommand.jsonTree = @[[HMJSONNode nodeWithJSON:apiResult.json]];
-       viewCommand.recieveDate = apiResult.date;
-       return viewCommand;
-#endif
        
-       return nil;
+       return command;
 }
 
 + (void)registerClass:(Class)commandClass
@@ -108,72 +82,6 @@ static NSMutableArray *registeredCommands = nil;
        [registeredCommands addObject:commandClass];
 }
 
-
-- (void)setArgumentsString:(NSString *)argumentsString
-{
-       _argumentsString = [argumentsString copy];
-       
-       NSString *unescape = [_argumentsString stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-       NSArray *pair = [unescape componentsSeparatedByString:@"&"];
-       NSMutableDictionary *dict = [NSMutableDictionary new];
-       for(NSString *p in pair) {
-               NSArray *pp = [p componentsSeparatedByString:@"="];
-               if([pp count] != 2) {
-                       NSLog(@"API (%@): Bad Argument: pair is odd.", self.api);
-                       continue;
-               }
-               [dict setObject:pp[1] forKey:pp[0]];
-       }
-       self.arguments = dict;
-       
-#if ENABLE_JSON_LOG
-       NSMutableArray *array = [NSMutableArray new];
-       for(NSString *p in pair) {
-               NSArray *pp = [p componentsSeparatedByString:@"="];
-               if([pp count] != 2) {
-                       NSLog(@"API (%@): Bad Argument: pair is odd.", self.api);
-                       continue;
-               }
-               [array addObject:@{@"key": pp[0], @"value": pp[1]}];
-       }
-       self.argumentArray = array;
-#endif
-}
-- (NSString *)argumentsString
-{
-       return [_argumentsString copy];
-}
-
-- (void)setJsonData:(NSData *)jsonData
-{
-       NSError *error = nil;
-       id json = [NSJSONSerialization JSONObjectWithData:jsonData
-                                                                                         options:NSJSONReadingAllowFragments
-                                                                                               error:&error];
-       if(error) {
-               HMAppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
-               [appDelegate logLineReturn:@"\e[1m\e[31mFail decode JSON data\e[39m\e[22m %@", error];
-               return;
-       }
-       if(![json isKindOfClass:[NSDictionary class]]) {
-               [self log:@"JSON is NOT NSDictionary."];
-               return;
-       }
-       if(![[json objectForKey:@"api_result"] isEqual:@1]) {
-               [self log:@"API result is fail."];
-               return;
-       }
-       self.json = json;
-       
-#if ENABLE_JSON_LOG
-       self.jsonTree = @[[HMJSONNode nodeWithJSON:json]];
-#endif
-}
-- (NSData *)jsonData
-{
-       return _jsonData;
-}
-
 NSString *keyByDeletingPrefix(NSString *key)
 {
        NSString *newKye = nil;

diff --git a/KCD/HMJSONReciever.m b/KCD/HMJSONReciever.m
index 659be7a..def88c7 100644 (file)
--- a/KCD/HMJSONReciever.m
+++ b/KCD/HMJSONReciever.m
@@ -73,28 +73,7 @@
        NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
        [[NSApp delegate] logLineReturn:@"body -> \n%@", string];
 #else
-//     NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-//     NSArray *elements = [string componentsSeparatedByString:@"="];
-//     if([elements count] != 2) {
-//             HMAppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
-//             [appDelegate logLineReturn:@"\e[1mwe could not compose data. api -> %@. Number of elements:\e[22m %ld", protocol.request.URL.path, [elements count]];
-//             [appDelegate logLineReturn:@"Original strings -> %@", string];
-//             [self removeDataForProtocol:protocol];
-//             return;
-//     }
-//     NSData *JSONData = [elements[1] dataUsingEncoding:NSUTF8StringEncoding];
-//     
-//     NSData *requestBodyData = [protocol.request HTTPBody];
-//     NSString *requestBodyString = [[NSString alloc] initWithData:requestBodyData encoding:NSUTF8StringEncoding];
        HMAPIResult *apiResult = [[HMAPIResult alloc] initWithRequest:protocol.request data:data];
-//     NSLog(@"api -> %@", apiResult.api);
-//     NSLog(@"success -> %@", apiResult.success ? @"YES" : @"NO");
-//     if(apiResult.success) {
-//             NSLog(@"json -> %@", apiResult.json);
-//             NSLog(@"param -> %@", apiResult.parameter);
-//     }
-       
-//     [self.queueu enqueue:@{@"api" : protocol.request.URL.path, @"argument": requestBodyString, @"json" : JSONData, @"date": [NSDate dateWithTimeIntervalSinceNow:0]}];
        [self.queueu enqueue:apiResult];
 #endif
        

diff --git a/KCD/HMJSONTracker.m b/KCD/HMJSONTracker.m
index 5a77eee..87b2a2b 100644 (file)
--- a/KCD/HMJSONTracker.m
+++ b/KCD/HMJSONTracker.m
@@ -48,13 +48,7 @@ static HMJSONTracker *sTracker = nil;
                        @autoreleasepool {
                                @try {
                                        id item = [self.queue dequeue];
-//                                     HMJSONCommand *command = [HMJSONCommand commandForAPI:[item objectForKey:@"api"]];
-//                                     command.argumentsString = [item objectForKey:@"argument"];
-//                                     command.jsonData = [item objectForKey:@"json"];
-//                                     command.recieveDate = [item objectForKey:@"date"];
-                                       
                                        HMJSONCommand *command = [HMJSONCommand commandForAPIResult:item];
-                                       
                                        [command execute];
                                        [NSThread sleepForTimeInterval:0.1];
                                }