コミット: 4974713914e5160adaf7f5c0b45a768be44b0dc5 - BooksExporter (git)

iSightを使ってBooklog,MediaMarkerインポート用CSVファイルを生成するアプリ

コミットメタ情報

• リビジョン: 4974713914e5160adaf7f5c0b45a768be44b0dc5 (tree)
• 日時: 2011-03-27 01:33:35
• 作者: masakih <masakih@user...>
• コミッター: masakih

ログメッセージ

[Mod] BERegisterSiteをNSCodingに適合。比較メソッドをオーバーライド。

変更サマリ

• modified: BERegisterSite.h
• modified: BERegisterSite.m
• modified: BooksExporter.xcodeproj/project.pbxproj

差分

--- a/BERegisterSite.h
+++ b/BERegisterSite.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface BERegisterSite : NSObject
+@interface BERegisterSite : NSObject <NSCoding>
 {
 	NSString *name;
 	NSString *home;

--- a/BERegisterSite.m
+++ b/BERegisterSite.m
@@ -82,4 +82,35 @@ static NSArray *sSites = nil;
 		//}
 	}
 }
+
+- (NSUInteger)hash
+{
+	return [name hash];
+}
+- (BOOL)isEqual:(BERegisterSite *)object
+{
+	if(![object isKindOfClass:[self class]]) return NO;
+	return [name isEqualToString:object.name];
+}
+
+#pragma mark NSCoding Protocol
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	self = [super init];
+	self.name = [aDecoder decodeObjectForKey:@"name"];
+	self.home = [aDecoder decodeObjectForKey:@"home"];
+	self.registerPage = [aDecoder decodeObjectForKey:@"registerPage"];
+	self.needID = [aDecoder decodeObjectForKey:@"needID"];
+	self.account = [aDecoder decodeObjectForKey:@"account"];
+	return self;
+}
+- (void)encodeWithCoder:(NSCoder *)aCoder
+{
+	[aCoder encodeObject:name forKey:@"name"];
+	[aCoder encodeObject:home forKey:@"home"];
+	[aCoder encodeObject:registerPage forKey:@"registerPage"];
+	[aCoder encodeObject:needID forKey:@"needID"];
+	[aCoder encodeObject:account forKey:@"account"];
+}
+
 @end

--- a/BooksExporter.xcodeproj/project.pbxproj
+++ b/BooksExporter.xcodeproj/project.pbxproj
@@ -343,37 +343,23 @@
 			children = (
 				F44EEB4A131A7E0F00CAA969 /* Base64EncDec.h */,
 				F44EEB4B131A7E0F00CAA969 /* Base64EncDec.m */,
+				F44EED03131BBC5D00CAA969 /* AmazonSecureKey.h */,
+				F44EED04131BBC5D00CAA969 /* AmazonSecureKey.c */,
 				F44EEAD3131A5ECE00CAA969 /* BEAmazonLookup.h */,
 				F44EEAD4131A5ECE00CAA969 /* BEAmazonLookup.m */,
-				F44EEAB2131A562F00CAA969 /* BEBookInformation.h */,
-				F44EEAB3131A562F00CAA969 /* BEBookInformation.m */,
 				F44EEB17131A752500CAA969 /* BEAmazonRequestGenerator.h */,
 				F44EEB18131A752500CAA969 /* BEAmazonRequestGenerator.m */,
-				F44EED03131BBC5D00CAA969 /* AmazonSecureKey.h */,
-				F44EED04131BBC5D00CAA969 /* AmazonSecureKey.c */,
-				F44EED12131BC11E00CAA969 /* BEExportAccessoryViewController.h */,
-				F44EED13131BC11E00CAA969 /* BEExportAccessoryViewController.m */,
-				F44EED16131BC19400CAA969 /* BEMainWindowController.h */,
-				F44EED17131BC19400CAA969 /* BEMainWindowController.m */,
+				F4D9DD5E133E47E4009DCEE6 /* Preferences */,
+				F4D9DD5D133E47CA009DCEE6 /* Exporter */,
 				F44EED2A131BC4B700CAA969 /* BEApplicationDelegate.h */,
 				F44EED2B131BC4B700CAA969 /* BEApplicationDelegate.m */,
-				F44EED8D131BD03300CAA969 /* BEBooksExporter.h */,
-				F44EED8E131BD03300CAA969 /* BEBooksExporter.m */,
-				F44EED98131BD15300CAA969 /* BEBooklogBooksExporter.h */,
-				F44EED99131BD15300CAA969 /* BEBooklogBooksExporter.m */,
-				F44EEE29131BF48A00CAA969 /* BEMediaMarkerBooksExporter.h */,
-				F44EEE2A131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m */,
-				F4EF5439132126570028459F /* BEMediaMarkerImportFormatExporter.h */,
-				F4EF543A132126570028459F /* BEMediaMarkerImportFormatExporter.m */,
-				F4EF5640132280780028459F /* BEHatenaDairyExporter.h */,
-				F4EF5641132280780028459F /* BEHatenaDairyExporter.m */,
-				F4D9D9C5133CC6DA009DCEE6 /* BEGeneralPreference.h */,
-				F4D9D9C6133CC6DA009DCEE6 /* BEGeneralPreference.m */,
-				F44EEEF0131D1DD800CAA969 /* BarcodeScanner */,
+				F44EED16131BC19400CAA969 /* BEMainWindowController.h */,
+				F44EED17131BC19400CAA969 /* BEMainWindowController.m */,
+				F44EED12131BC11E00CAA969 /* BEExportAccessoryViewController.h */,
+				F44EED13131BC11E00CAA969 /* BEExportAccessoryViewController.m */,
 				F4D9D9D0133CD88E009DCEE6 /* BERegisterSite.h */,
 				F4D9D9D1133CD88E009DCEE6 /* BERegisterSite.m */,
-				F4D9D9E9133CDE2B009DCEE6 /* BEPreferencePanel.h */,
-				F4D9D9EA133CDE2B009DCEE6 /* BEPreferencePanel.m */,
+				F44EEEF0131D1DD800CAA969 /* BarcodeScanner */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -482,10 +468,40 @@
 			isa = PBXGroup;
 			children = (
 				F4CD141E131D2ADF007788DC /* BooksExporter.xcdatamodel */,
+				F44EEAB2131A562F00CAA969 /* BEBookInformation.h */,
+				F44EEAB3131A562F00CAA969 /* BEBookInformation.m */,
 			);
 			name = Models;
 			sourceTree = "<group>";
 		};
+		F4D9DD5D133E47CA009DCEE6 /* Exporter */ = {
+			isa = PBXGroup;
+			children = (
+				F44EED8D131BD03300CAA969 /* BEBooksExporter.h */,
+				F44EED8E131BD03300CAA969 /* BEBooksExporter.m */,
+				F44EED98131BD15300CAA969 /* BEBooklogBooksExporter.h */,
+				F44EED99131BD15300CAA969 /* BEBooklogBooksExporter.m */,
+				F44EEE29131BF48A00CAA969 /* BEMediaMarkerBooksExporter.h */,
+				F44EEE2A131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m */,
+				F4EF5439132126570028459F /* BEMediaMarkerImportFormatExporter.h */,
+				F4EF543A132126570028459F /* BEMediaMarkerImportFormatExporter.m */,
+				F4EF5640132280780028459F /* BEHatenaDairyExporter.h */,
+				F4EF5641132280780028459F /* BEHatenaDairyExporter.m */,
+			);
+			name = Exporter;
+			sourceTree = "<group>";
+		};
+		F4D9DD5E133E47E4009DCEE6 /* Preferences */ = {
+			isa = PBXGroup;
+			children = (
+				F4D9D9E9133CDE2B009DCEE6 /* BEPreferencePanel.h */,
+				F4D9D9EA133CDE2B009DCEE6 /* BEPreferencePanel.m */,
+				F4D9D9C5133CC6DA009DCEE6 /* BEGeneralPreference.h */,
+				F4D9D9C6133CC6DA009DCEE6 /* BEGeneralPreference.m */,
+			);
+			name = Preferences;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */