From 5020592c414c83cf55aaf9e45f101e4ea0c0e3f9 Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Wed, 12 Mar 2014 22:00:53 +0900
Subject: [PATCH] =?utf8?q?=E8=89=A6=E5=A8=98=E3=81=AE=E4=B8=80=E8=A6=A7?=
 =?utf8?q?=E3=81=AE=E3=82=BD=E3=83=BC=E3=83=88=E3=82=92=E8=A8=98=E6=86=B6?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
 =?utf8?q?=20#50163?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/HMKenzoDockStatus.m                         |  7 +------
 KCD/HMNyukyoDockStatus.m                        | 10 ++--------
 KCD/HMShipViewController.xib                    | 20 +++++++++++++-------
 KCD/ja.lproj/HMPowerUpSupportViewController.xib | 23 ++++++++++++++---------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/KCD/HMKenzoDockStatus.m b/KCD/HMKenzoDockStatus.m
index 6bdf25f7..2affaa0f 100644
--- a/KCD/HMKenzoDockStatus.m
+++ b/KCD/HMKenzoDockStatus.m
@@ -90,15 +90,10 @@ enum {
 		return;
 	}
 	
-	NSNumber *state =[self.controller valueForKeyPath:@"selection.state"];
-	if(![state isKindOfClass:[NSNumber class]] || [state isEqualToNumber:@0] || [state isEqualToNumber:@(-1)]) {
-		self.time = nil;
-		return;
-	}
-	
 	NSNumber *compTimeValue = [self.controller valueForKeyPath:@"selection.complete_time"];
 	if(![compTimeValue isKindOfClass:[NSNumber class]]) {
 		self.time = nil;
+		return;
 	}
 	
 	NSTimeInterval compTime = (NSUInteger)([compTimeValue doubleValue] / 1000.0);
diff --git a/KCD/HMNyukyoDockStatus.m b/KCD/HMNyukyoDockStatus.m
index f73163d2..16f7c185 100644
--- a/KCD/HMNyukyoDockStatus.m
+++ b/KCD/HMNyukyoDockStatus.m
@@ -71,7 +71,7 @@ enum {
 				if(!self.isTasking) self.isTasking = YES;
 				break;
 			default:
-				NSLog(@"Mission status is %ld", status);
+				NSLog(@"Nyukyo Dock status is %ld", status);
 				break;
 		}
 		return;
@@ -87,17 +87,11 @@ enum {
 		return;
 	}
 	
-	NSNumber *state =[self.controller valueForKeyPath:@"selection.state"];
-	if(![state isKindOfClass:[NSNumber class]] || [state isEqualToNumber:@0] || [state isEqualToNumber:@(-1)]) {
-		self.name = nil;
-		self.time = nil;
-		return;
-	}
-	
 	NSNumber *compTimeValue = [self.controller valueForKeyPath:@"selection.complete_time"];
 	if(![compTimeValue isKindOfClass:[NSNumber class]]) {
 		self.name = nil;
 		self.time = nil;
+		return;
 	}
 	
 	NSTimeInterval compTime = (NSUInteger)([compTimeValue doubleValue] / 1000.0);
diff --git a/KCD/HMShipViewController.xib b/KCD/HMShipViewController.xib
index b15096f3..aac49fad 100644
--- a/KCD/HMShipViewController.xib
+++ b/KCD/HMShipViewController.xib
@@ -24,14 +24,14 @@
                         <rect key="frame" x="1" y="17" width="304" height="334"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable1" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
                                 <rect key="frame" x="0.0" y="0.0" width="304" height="334"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn width="33" minWidth="33" maxWidth="1000" id="sNi-c1-2zU">
+                                    <tableColumn identifier="no" width="33" minWidth="33" maxWidth="1000" id="sNi-c1-2zU">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="No.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -47,7 +47,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.master_ship.sortno" id="HdN-nH-86V"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="80.45703125" minWidth="40" maxWidth="1000" id="82a-ca-AZb">
+                                    <tableColumn identifier="name" width="80.45703125" minWidth="40" maxWidth="1000" id="82a-ca-AZb">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名前">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -63,7 +63,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.master_ship.name" id="Oz0-gn-Mpo"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="31" minWidth="10" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
+                                    <tableColumn identifier="type" width="31" minWidth="10" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="艦種">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -79,7 +79,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.shortTypeName" id="Y9U-un-2KJ"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="29" minWidth="22" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
+                                    <tableColumn identifier="lv" width="29" minWidth="22" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Lv.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -95,7 +95,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.lv" id="rQg-DP-z4O"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="64.43359375" minWidth="10" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
+                                    <tableColumn identifier="exp" width="64.43359375" minWidth="10" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Exp.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -111,7 +111,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.exp" id="f1g-3G-oep"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="49" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
+                                    <tableColumn identifier="next" width="49" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Next">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -186,7 +186,13 @@
         <arrayController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" id="b8v-Gn-JZD" userLabel="Ship">
             <connections>
                 <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="mMh-Jt-CpI"/>
+                <binding destination="Ai5-X2-MeM" name="sortDescriptors" keyPath="values.shipviewsortdescriptor" id="YcO-8D-TfY">
+                    <dictionary key="options">
+                        <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
+                    </dictionary>
+                </binding>
             </connections>
         </arrayController>
+        <userDefaultsController representsSharedInstance="YES" id="Ai5-X2-MeM"/>
     </objects>
 </document>
\ No newline at end of file
diff --git a/KCD/ja.lproj/HMPowerUpSupportViewController.xib b/KCD/ja.lproj/HMPowerUpSupportViewController.xib
index c003a9c8..fd81c78c 100644
--- a/KCD/ja.lproj/HMPowerUpSupportViewController.xib
+++ b/KCD/ja.lproj/HMPowerUpSupportViewController.xib
@@ -25,14 +25,14 @@
                         <rect key="frame" x="1" y="17" width="304" height="334"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="powerupsupportview" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
                                 <rect key="frame" x="0.0" y="0.0" width="304" height="334"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn width="33" minWidth="33" maxWidth="1000" id="sNi-c1-2zU">
+                                    <tableColumn identifier="no" width="33" minWidth="33" maxWidth="1000" id="sNi-c1-2zU">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="No.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -48,7 +48,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.master_ship.sortno" id="HdN-nH-86V"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="76" minWidth="40" maxWidth="1000" id="82a-ca-AZb">
+                                    <tableColumn identifier="name" width="76" minWidth="40" maxWidth="1000" id="82a-ca-AZb">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名前">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -64,7 +64,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.master_ship.name" id="Oz0-gn-Mpo"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="31" minWidth="10" maxWidth="3.4028234663852886e+38" id="u6A-sR-Kyv">
+                                    <tableColumn identifier="lv" width="31" minWidth="10" maxWidth="3.4028234663852886e+38" id="u6A-sR-Kyv">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Lv.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -80,7 +80,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.lv" id="qEu-ub-xiv"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
+                                    <tableColumn identifier="karyoku" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="火力">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -95,7 +95,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxKaryoku" id="kFw-53-Ztq"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="28" minWidth="22" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
+                                    <tableColumn identifier="raisou" width="28" minWidth="22" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="雷装">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -110,7 +110,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxRaisou" id="4Et-xX-GBO"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
+                                    <tableColumn identifier="taiku" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="対空">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -125,7 +125,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxTaiku" id="Fbm-nQ-g0X"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
+                                    <tableColumn identifier="soukou" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="装甲">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -140,7 +140,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxSoukou" id="rId-U9-Y9l"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="zY7-Tf-YmF">
+                                    <tableColumn identifier="lucky" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="zY7-Tf-YmF">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="運">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -274,6 +274,11 @@
         <arrayController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" id="b8v-Gn-JZD" userLabel="Ship">
             <connections>
                 <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="mMh-Jt-CpI"/>
+                <binding destination="O24-QT-DRL" name="sortDescriptors" keyPath="values.powerupsupportsortdecriptor" id="KVq-5k-1KQ">
+                    <dictionary key="options">
+                        <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
+                    </dictionary>
+                </binding>
             </connections>
         </arrayController>
         <userDefaultsController representsSharedInstance="YES" id="O24-QT-DRL"/>
-- 
2.11.0