Commit: c2f53ce9fe19b1f890927cd845d302f3fb7e6856 - BooksExporter (git)

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

Commit MetaInfo

• Revision: c2f53ce9fe19b1f890927cd845d302f3fb7e6856 (tree)
• Time: 2011-04-10 10:02:14
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Mod] リストアをBEExporterAttributeで行うようにした。

Change Summary

• modified: BEExporterAttribute.m
• modified: BEGeneralPreference.m
• modified: BEPreference.h

Incremental Difference

--- a/BEExporterAttribute.m
+++ b/BEExporterAttribute.m
@@ -7,6 +7,8 @@
 //
 
 #import "BEExporterAttribute.h"
+#import "BEPreference.h"
+
 
 @interface BEExporterAttribute()
 @property ExporterType type;
@@ -44,7 +46,24 @@ static NSArray *attributes = nil;
 		[array addObject:attr];
 	}
 	
-	attributes = [[NSArray alloc] initWithArray:array];
+	
+	NSArray *stored = [BEPreference preference].attributes;
+	if(!stored) {
+		attributes = [[NSArray alloc] initWithArray:array];
+		return attributes;
+	}
+	if([array isEqual:stored]) {
+		attributes = [stored retain];
+		return attributes;
+	}
+	NSMutableArray *newAttr = [stored mutableCopy];
+	for(id obj in array) {
+		if(![newAttr containsObject:obj]) {
+			[newAttr addObject:obj];
+		}
+	}
+	
+	attributes = [[NSArray alloc] initWithArray:newAttr];
 	return attributes;
 }
 	
@@ -55,6 +74,28 @@ static NSArray *attributes = nil;
 	}
 	return nil;
 }
+- (void)restoreAttributes
+{
+	NSArray *stored = [BEPreference preference].attributes;
+	if(!stored) {
+		attributes = [[BEExporterAttribute attribtues] retain];
+		return;
+	}
+	
+	NSArray *origin = [BEExporterAttribute attribtues];
+	if([origin isEqual:stored]) {
+		attributes = [stored retain];
+		return;
+	}
+	
+	NSMutableArray *newAttr = [stored mutableCopy];
+	for(id obj in origin) {
+		if(![newAttr containsObject:obj]) {
+			[newAttr addObject:obj];
+		}
+	}
+	attributes = [[NSArray alloc] initWithArray:newAttr];
+}
 
 - (NSString *)name
 {

--- a/BEGeneralPreference.m
+++ b/BEGeneralPreference.m
@@ -13,7 +13,6 @@
 
 
 @interface BEGeneralPreference (BEPrivate)
-- (void)restoreAttributes;
 - (void)setSelection:(id)newSelection;
 @end
 
@@ -25,7 +24,7 @@
 	if(self) {
 		[self setTitle:NSLocalizedString(@"General", @"General")];
 		sites = [[BERegisterSite sites] retain];
-		[self restoreAttributes];
+		attributes = [[BEExporterAttribute attribtues] retain];
 		[self setSelection:[attributes objectAtIndex:0]];
 	}
 	return self;
@@ -38,30 +37,6 @@
 	[super dealloc];
 }
 
-- (void)restoreAttributes
-{
-	NSArray *stored = [BEPreference preference].attributes;
-	if(!stored) {
-		attributes = [[BEExporterAttribute attribtues] retain];
-		return;
-	}
-	
-	NSArray *origin = [BEExporterAttribute attribtues];
-	if([origin isEqual:stored]) {
-		attributes = [stored retain];
-		return;
-	}
-	
-	NSMutableArray *array = [stored mutableCopy];
-	for(id obj in origin) {
-		if(![array containsObject:obj]) {
-			[array addObject:obj];
-		}
-	}
-	attributes = [[NSArray alloc] initWithArray:array];
-}
-
-
 - (void)setSelection:(id)newSelection
 {
 	if(selection == newSelection) return;

--- a/BEPreference.h
+++ b/BEPreference.h
@@ -16,5 +16,5 @@ extern NSString *const BEOpenSite;	// BERegisterSite.
 
 + (BEPreference *)preference;
 
-@property (nonatomic, retain) NSArray *attributes;
+@property (nonatomic, retain) NSArray *attributes;	// Array of BEExporterAttribute.
 @end