HMxxx2Commandを廃止してその親クラスでAPIごとに処理を変更するようにした

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 0fc3cfd..e949d69 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -25,10 +25,6 @@
                F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F46F104718ABAC910063E503 /* KCD.xcdatamodeld */; };
                F47B78B218A7B42B0011386E /* HMJSONViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */; };
                F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B011907D7B800E78AE1 /* HMPortCommand.m */; };
-               F48F7B051907F0B900E78AE1 /* HMMemberShip2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B041907F0B900E78AE1 /* HMMemberShip2Command.m */; };
-               F48F7B0819092D3000E78AE1 /* HMMemberNDock2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B0719092D2F00E78AE1 /* HMMemberNDock2Command.m */; };
-               F48F7B0B19092F8000E78AE1 /* HMMemberMaterial2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B0A19092F8000E78AE1 /* HMMemberMaterial2Command.m */; };
-               F48F7B0E1909312000E78AE1 /* HMMemberDeck2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B0D1909312000E78AE1 /* HMMemberDeck2Command.m */; };
                F494DC5F18C30AE100AE97E4 /* HMMissionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = F494DC5E18C30AE100AE97E4 /* HMMissionStatus.m */; };
                F494DC6318C608C100AE97E4 /* HMShipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F494DC6118C608C100AE97E4 /* HMShipViewController.m */; };
                F494DC6718C8BA6400AE97E4 /* HMPowerUpSupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F494DC6618C8BA6400AE97E4 /* HMPowerUpSupportViewController.m */; };
@@ -138,14 +134,6 @@
                F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMJSONViewWindowController.m; sourceTree = "<group>"; };
                F48F7B001907D7B800E78AE1 /* HMPortCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPortCommand.h; sourceTree = "<group>"; };
                F48F7B011907D7B800E78AE1 /* HMPortCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPortCommand.m; sourceTree = "<group>"; };
-               F48F7B031907F0B900E78AE1 /* HMMemberShip2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberShip2Command.h; sourceTree = "<group>"; };
-               F48F7B041907F0B900E78AE1 /* HMMemberShip2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberShip2Command.m; sourceTree = "<group>"; };
-               F48F7B0619092D2F00E78AE1 /* HMMemberNDock2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberNDock2Command.h; sourceTree = "<group>"; };
-               F48F7B0719092D2F00E78AE1 /* HMMemberNDock2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberNDock2Command.m; sourceTree = "<group>"; };
-               F48F7B0919092F8000E78AE1 /* HMMemberMaterial2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberMaterial2Command.h; sourceTree = "<group>"; };
-               F48F7B0A19092F8000E78AE1 /* HMMemberMaterial2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberMaterial2Command.m; sourceTree = "<group>"; };
-               F48F7B0C1909312000E78AE1 /* HMMemberDeck2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberDeck2Command.h; sourceTree = "<group>"; };
-               F48F7B0D1909312000E78AE1 /* HMMemberDeck2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberDeck2Command.m; sourceTree = "<group>"; };
                F494DC5618C23E4300AE97E4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = "<group>"; };
                F494DC5718C23E4300AE97E4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                F494DC5918C23E4400AE97E4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -504,24 +492,16 @@
                                F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */,
                                F4B414FC18B3A66200468DAF /* HMMemberNDockCommand.h */,
                                F4B414FD18B3A66200468DAF /* HMMemberNDockCommand.m */,
-                               F48F7B0619092D2F00E78AE1 /* HMMemberNDock2Command.h */,
-                               F48F7B0719092D2F00E78AE1 /* HMMemberNDock2Command.m */,
                                F4513EE618B77A5300073552 /* HMMemberKDockCommand.h */,
                                F4513EE718B77A5300073552 /* HMMemberKDockCommand.m */,
                                F4513EE918B7900A00073552 /* HMMemberDeckCommand.h */,
                                F4513EEA18B7900A00073552 /* HMMemberDeckCommand.m */,
-                               F48F7B0C1909312000E78AE1 /* HMMemberDeck2Command.h */,
-                               F48F7B0D1909312000E78AE1 /* HMMemberDeck2Command.m */,
                                F4513EEC18B8E2F600073552 /* HMMemberMaterialCommand.h */,
                                F4513EED18B8E2F600073552 /* HMMemberMaterialCommand.m */,
-                               F48F7B0919092F8000E78AE1 /* HMMemberMaterial2Command.h */,
-                               F48F7B0A19092F8000E78AE1 /* HMMemberMaterial2Command.m */,
                                F4513EF118B991F800073552 /* HMMemberBasicCommand.h */,
                                F4513EF218B991F800073552 /* HMMemberBasicCommand.m */,
                                F4513EF418B9F29800073552 /* HMMemberShipCommand.h */,
                                F4513EF518B9F29800073552 /* HMMemberShipCommand.m */,
-                               F48F7B031907F0B900E78AE1 /* HMMemberShip2Command.h */,
-                               F48F7B041907F0B900E78AE1 /* HMMemberShip2Command.m */,
                                F4E33B5618BF5F67005B8C07 /* HMMemberSlotItemCommand.h */,
                                F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */,
                                F4E7802618DBD2A00011BC4C /* HMGetShipCommand.h */,
@@ -650,7 +630,6 @@
                        files = (
                                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */,
                                F4B3DC4418E70B370011B4FC /* HMServerDataStore.m in Sources */,
-                               F48F7B0E1909312000E78AE1 /* HMMemberDeck2Command.m in Sources */,
                                F4D2CBC518AE2AE2000EBC59 /* HMCompositCommand.m in Sources */,
                                F4C1190218A6FFC2005D5B25 /* HMQueue.m in Sources */,
                                F4513EEB18B7900A00073552 /* HMMemberDeckCommand.m in Sources */,
@@ -672,10 +651,8 @@
                                F4BDEB53187252F30069D0CE /* main.m in Sources */,
                                F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */,
                                F494DC5F18C30AE100AE97E4 /* HMMissionStatus.m in Sources */,
-                               F48F7B0819092D3000E78AE1 /* HMMemberNDock2Command.m in Sources */,
                                F4513EE418B635EA00073552 /* HMDocksViewController.m in Sources */,
                                F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */,
-                               F48F7B0B19092F8000E78AE1 /* HMMemberMaterial2Command.m in Sources */,
                                F47B78B218A7B42B0011386E /* HMJSONViewWindowController.m in Sources */,
                                F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */,
                                F4C118FC18A67B1C005D5B25 /* CustomHTTPProtocol.m in Sources */,
@@ -708,7 +685,6 @@
                                F46F104518AA50730063E503 /* HMBroserWindowController.m in Sources */,
                                F4B414EC18B0A7D600468DAF /* HMMasterUseItemCommand.m in Sources */,
                                F4513EF318B991F800073552 /* HMMemberBasicCommand.m in Sources */,
-                               F48F7B051907F0B900E78AE1 /* HMMemberShip2Command.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/KCD/HMCompositCommand.m b/KCD/HMCompositCommand.m
index c456d87..ff56333 100644 (file)
--- a/KCD/HMCompositCommand.m
+++ b/KCD/HMCompositCommand.m
@@ -39,6 +39,12 @@
        }
 }
 
+- (void)setApi:(NSString *)api
+{
+       for(id command in self.commands) {
+               [command setApi:api];
+       }
+}
 - (void)setArgumentsString:(NSString *)argumentsString
 {
        for(id command in self.commands) {

diff --git a/KCD/HMMemberDeck2Command.h b/KCD/HMMemberDeck2Command.h
deleted file mode 100644 (file)
index f7d3f1e..0000000
--- a/KCD/HMMemberDeck2Command.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMMemberDeck2Command.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberDeckCommand.h"
-
-@interface HMMemberDeck2Command : HMMemberDeckCommand
-
-@end

diff --git a/KCD/HMMemberDeck2Command.m b/KCD/HMMemberDeck2Command.m
deleted file mode 100644 (file)
index 6c3b770..0000000
--- a/KCD/HMMemberDeck2Command.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  HMMemberDeck2Command.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberDeck2Command.h"
-
-@implementation HMMemberDeck2Command
-- (NSString *)dataKey
-{
-       return @"api_data.api_deck_port";
-}
-@end

diff --git a/KCD/HMMemberDeckCommand.m b/KCD/HMMemberDeckCommand.m
index 1fdaab3..837739d 100644 (file)
--- a/KCD/HMMemberDeckCommand.m
+++ b/KCD/HMMemberDeckCommand.m
@@ -34,6 +34,14 @@
        if([api isEqualToString:@"/kcsapi/api_get_member/deck_port"]) return YES;
        return NO;
 }
+
+- (NSString *)dataKey
+{
+       if([self.api isEqualToString:@"/kcsapi/api_port/port"]) {
+               return @"api_data.api_deck_port";
+       }
+       return [super dataKey];
+}
 - (void)execute
 {
        [self commitJSONToEntityNamed:@"Deck"];

diff --git a/KCD/HMMemberMaterial2Command.h b/KCD/HMMemberMaterial2Command.h
deleted file mode 100644 (file)
index c2903c4..0000000
--- a/KCD/HMMemberMaterial2Command.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMMemberMaterial2Command.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberMaterialCommand.h"
-
-@interface HMMemberMaterial2Command : HMMemberMaterialCommand
-
-@end

diff --git a/KCD/HMMemberMaterial2Command.m b/KCD/HMMemberMaterial2Command.m
deleted file mode 100644 (file)
index 31f6e86..0000000
--- a/KCD/HMMemberMaterial2Command.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  HMMemberMaterial2Command.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberMaterial2Command.h"
-
-@implementation HMMemberMaterial2Command
-- (NSString *)dataKey
-{
-       return @"api_data.api_material";
-}
-@end

diff --git a/KCD/HMMemberMaterialCommand.m b/KCD/HMMemberMaterialCommand.m
index 76f6950..06a2d8c 100644 (file)
--- a/KCD/HMMemberMaterialCommand.m
+++ b/KCD/HMMemberMaterialCommand.m
@@ -25,7 +25,10 @@
 }
 - (NSString *)dataKey
 {
-       return @"api_data";
+       if([self.api isEqualToString:@"/kcsapi/api_port/port"]) {
+               return @"api_data.api_material";
+       }
+       return [super dataKey];
 }
 - (void)execute
 {

diff --git a/KCD/HMMemberNDock2Command.h b/KCD/HMMemberNDock2Command.h
deleted file mode 100644 (file)
index f07de08..0000000
--- a/KCD/HMMemberNDock2Command.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMMemberNDock2Command.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberNDockCommand.h"
-
-@interface HMMemberNDock2Command : HMMemberNDockCommand
-
-@end

diff --git a/KCD/HMMemberNDock2Command.m b/KCD/HMMemberNDock2Command.m
deleted file mode 100644 (file)
index 00fb970..0000000
--- a/KCD/HMMemberNDock2Command.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  HMMemberNDock2Command.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/24.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberNDock2Command.h"
-
-@implementation HMMemberNDock2Command
-- (NSString *)dataKey
-{
-       return @"api_data.api_ndock";
-}
-@end

diff --git a/KCD/HMMemberNDockCommand.m b/KCD/HMMemberNDockCommand.m
index b255264..fb6c51a 100644 (file)
--- a/KCD/HMMemberNDockCommand.m
+++ b/KCD/HMMemberNDockCommand.m
@@ -21,6 +21,14 @@
 {
        return [api isEqualToString:@"/kcsapi/api_get_member/ndock"];
 }
+
+- (NSString *)dataKey
+{
+       if([self.api isEqualToString:@"/kcsapi/api_port/port"]) {
+               return @"api_data.api_ndock";
+       }
+       return [super dataKey];
+}
 - (void)execute
 {
        [self commitJSONToEntityNamed:@"NyukyoDock"];

diff --git a/KCD/HMMemberShip2Command.h b/KCD/HMMemberShip2Command.h
deleted file mode 100644 (file)
index b198336..0000000
--- a/KCD/HMMemberShip2Command.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMMemberShip2Command.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/23.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberShipCommand.h"
-
-@interface HMMemberShip2Command : HMMemberShipCommand
-
-@end

diff --git a/KCD/HMMemberShip2Command.m b/KCD/HMMemberShip2Command.m
deleted file mode 100644 (file)
index 09f2903..0000000
--- a/KCD/HMMemberShip2Command.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  HMMemberShip2Command.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/04/23.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMemberShip2Command.h"
-
-@implementation HMMemberShip2Command
-- (NSString *)dataKey
-{
-       return @"api_data.api_ship";
-}
-@end

diff --git a/KCD/HMMemberShipCommand.m b/KCD/HMMemberShipCommand.m
index a7795ee..025ab75 100644 (file)
--- a/KCD/HMMemberShipCommand.m
+++ b/KCD/HMMemberShipCommand.m
@@ -79,6 +79,13 @@ static NSCondition *sCondition = nil;
        [self commitJSONToEntityNamed:@"Ship"];
 }
 
+- (NSString *)dataKey
+{
+       if([self.api isEqualToString:@"/kcsapi/api_port/port"]) {
+               return @"api_data.api_ship";
+       }
+       return [super dataKey];
+}
 
 - (void)setMasterShip:(id)value toObject:(NSManagedObject *)object
 {

diff --git a/KCD/HMPortCommand.m b/KCD/HMPortCommand.m
index c9751d4..1b97a88 100644 (file)
--- a/KCD/HMPortCommand.m
+++ b/KCD/HMPortCommand.m
@@ -8,11 +8,11 @@
 
 #import "HMPortCommand.h"
 
-#import "HMMemberShip2Command.h"
-#import "HMMemberMaterial2Command.h"
-#import "HMMemberDeck2Command.h"
+#import "HMMemberShipCommand.h"
+#import "HMMemberMaterialCommand.h"
+#import "HMMemberDeckCommand.h"
 #import "HMMemberBasicCommand.h"
-#import "HMMemberNDock2Command.h"
+#import "HMMemberNDockCommand.h"
 
 
 @implementation HMPortCommand
@@ -33,9 +33,9 @@
 {
        self = [super init];
        self = [[super class] compositCommandWithCommands:
-                       [HMMemberShip2Command new], [HMMemberMaterial2Command new],
-                       [HMMemberDeck2Command new], [HMMemberBasicCommand new],
-                       [HMMemberNDock2Command new],
+                       [HMMemberShipCommand new], [HMMemberMaterialCommand new],
+                       [HMMemberDeckCommand new], [HMMemberBasicCommand new],
+                       [HMMemberNDockCommand new],
                        nil];
        return self;
 }

diff --git a/KCD/ja.lproj/HMJSONViewWindowController.xib b/KCD/ja.lproj/HMJSONViewWindowController.xib
index ce5c5b9..bee6f80 100644 (file)
--- a/KCD/ja.lproj/HMJSONViewWindowController.xib
+++ b/KCD/ja.lproj/HMJSONViewWindowController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
+        <deployment defaultVersion="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMJSONViewWindowController">
@@ -194,13 +194,13 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="dnc-Sp-d3b" indentationPerLevel="16" outlineTableColumn="pi6-QA-JsM" id="AqR-oy-4oh">
-                                    <rect key="frame" x="0.0" y="0.0" width="395" height="346"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="470" height="346"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="101" minWidth="16" maxWidth="1000" id="pi6-QA-JsM">
+                                        <tableColumn width="176" minWidth="16" maxWidth="1000" id="pi6-QA-JsM">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -237,8 +237,8 @@
                             </subviews>
                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
-                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="t4j-hV-YXH">
-                            <rect key="frame" x="1" y="119" width="223" height="15"/>
+                        <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="t4j-hV-YXH">
+                            <rect key="frame" x="1" y="347" width="395" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="WPk-fv-21o">
@@ -246,7 +246,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <tableHeaderView key="headerView" id="dnc-Sp-d3b">
-                            <rect key="frame" x="0.0" y="0.0" width="395" height="17"/>
+                            <rect key="frame" x="0.0" y="0.0" width="470" height="17"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </tableHeaderView>
                     </scrollView>