コミット: dbd7973de092e30900a5e92cf3967c9cda58bd47 - PreviewerSelector (git)

「プロジェクト終了」　BathyScapheのプレビューアプラグインを複数使用出来るようにするプラグイン

コミットメタ情報

• リビジョン: dbd7973de092e30900a5e92cf3967c9cda58bd47 (tree)
• 日時: 2012-07-14 20:56:52
• 作者: masakih <masakih@user...>
• コミッター: masakih

ログメッセージ

[Mod] プロパティ用インスタンス変数に_を付けた

変更サマリ

• modified: PSPPreviewerTableView.h
• modified: PSPreviewerItem.h
• modified: PSPreviewerItem.m
• modified: PSPreviewerItems.h
• modified: PSPreviewerItems.m
• modified: PreviewerSelector.h
• modified: PreviewerSelector.m

差分

--- a/PSPPreviewerTableView.h
+++ b/PSPPreviewerTableView.h
@@ -10,8 +10,5 @@
 
 
 @interface PSPPreviewerTableView : NSTableView
-{
-
-}
 
 @end

--- a/PSPreviewerItem.h
+++ b/PSPreviewerItem.h
@@ -11,13 +11,13 @@
 
 @interface PSPreviewerItem : NSObject <NSCopying, NSCoding>
 {
-	id previewer;	// コピーしない。 codingしない。
-	NSString *identifier;
-	NSString *displayName;
-	NSString *path;
-	NSString *version;
-	BOOL tryCheck;
-	BOOL displayInMenu;
+	id _previewer;	// コピーしない。 codingしない。
+	NSString *_identifier;
+	NSString *_displayName;
+	NSString *_path;
+	NSString *_version;
+	BOOL _tryCheck;
+	BOOL _displayInMenu;
 }
 
 - (id)initWithIdentifier:(NSString *)identifier;

--- a/PSPreviewerItem.m
+++ b/PSPreviewerItem.m
@@ -20,10 +20,10 @@ static NSMutableDictionary *previewerInfo = nil;
 
 @implementation PSPreviewerItem
 
-@synthesize identifier;
-@synthesize previewer;
-@synthesize displayName, path, version;
-@synthesize tryCheck, displayInMenu;
+@synthesize identifier = _identifier;
+@synthesize previewer = _previewer;
+@synthesize displayName = _displayName, path = _path, version = _version;
+@synthesize tryCheck = _tryCheck, displayInMenu = _displayInMenu;
 
 + (void)initialize
 {
@@ -38,7 +38,7 @@ static NSMutableDictionary *previewerInfo = nil;
 - (id)initWithIdentifier:(NSString *)inIdentifier
 {
 	if(self = [super init]) {
-		identifier = [inIdentifier copy];
+		_identifier = [inIdentifier copy];
 	}
 	
 	return self;
@@ -46,26 +46,26 @@ static NSMutableDictionary *previewerInfo = nil;
 
 - (void)dealloc
 {
-	self.previewer = nil;
-	self.displayName = nil;
-	self.path = nil;
-	self.version = nil;
+	[_previewer release];
+	[_displayName release];
+	[_path release];
+	[_version release];
 	
-	[identifier release];
+	[_identifier release];
 	
 	[super dealloc];
 }
 
 - (void)setPreviewer:(id)newPreviewer
 {
-	if(previewer == newPreviewer) return;
+	if(_previewer == newPreviewer) return;
 	
-	[previewer autorelease];
+	[_previewer autorelease];
 	
 	if(!newPreviewer) return;
 	
-	previewer = [newPreviewer retain];
-	[previewerInfo setObject:previewer forKey:identifier];
+	_previewer = [newPreviewer retain];
+	[previewerInfo setObject:_previewer forKey:_identifier];
 }
 
 - (BOOL)isEqual:(id)object
@@ -88,25 +88,25 @@ static NSMutableDictionary *previewerInfo = nil;
 
 - (id)copyWithZone:(NSZone *)zone
 {
-	PSPreviewerItem *result = [[[self class] allocWithZone:zone] initWithIdentifier:identifier];
-	result.previewer = previewer;
-	result.displayName = displayName;
-	result.version = version;
-	result.path = path;
-	result.tryCheck = tryCheck;
-	result.displayInMenu = displayInMenu;
+	PSPreviewerItem *result = [[[self class] allocWithZone:zone] initWithIdentifier:_identifier];
+	result.previewer = _previewer;
+	result.displayName = _displayName;
+	result.version = _version;
+	result.path = _path;
+	result.tryCheck = _tryCheck;
+	result.displayInMenu = _displayInMenu;
 	
 	return result;
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder
 {
-	[aCoder encodeObject:identifier forKey:PSPIIdentifierKey];
-	[aCoder encodeObject:displayName forKey:PSIDisplayNameKey];
-	[aCoder encodeObject:path forKey:PSIPathKey];
-	[aCoder encodeObject:version forKey:PSIVersionKey];
-	[aCoder encodeBool:tryCheck forKey:PSPITryCheckKey];
-	[aCoder encodeBool:displayInMenu forKey:PSPIDisplayInMenuKey];
+	[aCoder encodeObject:_identifier forKey:PSPIIdentifierKey];
+	[aCoder encodeObject:_displayName forKey:PSIDisplayNameKey];
+	[aCoder encodeObject:_path forKey:PSIPathKey];
+	[aCoder encodeObject:_version forKey:PSIVersionKey];
+	[aCoder encodeBool:_tryCheck forKey:PSPITryCheckKey];
+	[aCoder encodeBool:_displayInMenu forKey:PSPIDisplayInMenuKey];
 }
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
@@ -117,8 +117,7 @@ static NSMutableDictionary *previewerInfo = nil;
 	self.tryCheck = [aDecoder decodeBoolForKey:PSPITryCheckKey];
 	self.displayInMenu = [aDecoder decodeBoolForKey:PSPIDisplayInMenuKey];
 	
-	id p = [previewerInfo objectForKey:identifier];
-	if(p) self.previewer = p;
+	self.previewer = [previewerInfo objectForKey:_identifier];
 	
 	return self;
 }

--- a/PSPreviewerItems.h
+++ b/PSPreviewerItems.h
@@ -13,7 +13,7 @@
 
 @interface PSPreviewerItems : NSObject
 {
-	NSMutableArray *previewerItems;
+	NSMutableArray *_previewerItems;
 }
 
 - (void)setPreference:(id)pref;

--- a/PSPreviewerItems.m
+++ b/PSPreviewerItems.m
@@ -30,14 +30,14 @@ static NSString *noarmalImagePreviewerName = @"ImagePreviewer";
 - (id)init
 {
 	[super init];
-	previewerItems = [[NSMutableArray alloc] init];
+	_previewerItems = [[NSMutableArray alloc] init];
 	
 	return self;
 }
 
 - (NSArray *)previewerItems
 {
-	return previewerItems;
+	return _previewerItems;
 }
 - (void)setPreference:(id)pref
 {
@@ -56,13 +56,13 @@ static NSString *noarmalImagePreviewerName = @"ImagePreviewer";
 	
 	// リストアされ且つロード済のプラグインを追加
 	for(PSPreviewerItem *item in retoredItems) {
-		if([previewerItems containsObject:item]) {
+		if([_previewerItems containsObject:item]) {
 			[newItems addObject:item];
 		}
 	}
 	
 	// リストアされていないがロード済のプラグインを追加
-	for(PSPreviewerItem *item in previewerItems) {
+	for(PSPreviewerItem *item in _previewerItems) {
 		if(![newItems containsObject:item]) {
 			[newItems addObject:item];
 		} else {
@@ -74,13 +74,13 @@ static NSString *noarmalImagePreviewerName = @"ImagePreviewer";
 		}
 	}
 	
-	[previewerItems autorelease];
-	previewerItems = [newItems retain];
+	[_previewerItems autorelease];
+	_previewerItems = [newItems retain];
 }
 
 - (void)awakePreviewers
 {
-	for(PSPreviewerItem *item in previewerItems) {
+	for(PSPreviewerItem *item in _previewerItems) {
 		id previewer = [item previewer];
 		if([previewer respondsToSelector:@selector(awakeByPreviewerSelector:)]) {
 			[previewer performSelector:@selector(awakeByPreviewerSelector:)
@@ -116,8 +116,8 @@ static NSString *noarmalImagePreviewerName = @"ImagePreviewer";
 	v = [pluginBundle objectForInfoDictionaryKey:@"BSPreviewerDisplayName"];
 	item.displayName = v ?: name;
 	
-	if(![previewerItems containsObject:item]) {
-		[previewerItems addObject:item];
+	if(![_previewerItems containsObject:item]) {
+		[_previewerItems addObject:item];
 	}
 }
 - (void)loadDefaultPreviewer

--- a/PreviewerSelector.h
+++ b/PreviewerSelector.h
@@ -15,8 +15,8 @@
 
 @interface PreviewerSelector : NSObject <BSImagePreviewerProtocol, BSLinkPreviewing>
 {
-	AppDefaults *preferences;
-	PSPreviewerItems *items;
+	AppDefaults *_preferences;
+	PSPreviewerItems *_items;
 }
 
 + (id)sharedInstance;

--- a/PreviewerSelector.m
+++ b/PreviewerSelector.m
@@ -163,7 +163,7 @@ final:
 
 - (NSArray *)loadedPlugInsInfo
 {
-	return [items previewerItems];
+	return [_items previewerItems];
 }
 
 - (void)savePlugInsInfo
@@ -287,7 +287,7 @@ final:
 {
 	self = [self init];
 	
-	items = [[PSPreviewerItems alloc] init];
+	_items = [[PSPreviewerItems alloc] init];
 	
 	[self setPreferences:prefs];
 	
@@ -296,15 +296,15 @@ final:
 	// Accessor
 - (AppDefaults *)preferences
 {
-	return preferences;
+	return _preferences;
 }
 - (void)setPreferences:(AppDefaults *)aPreferences
 {
-	id temp = preferences;
-	preferences = [aPreferences retain];
+	id temp = _preferences;
+	_preferences = [aPreferences retain];
 	[temp release];
 	
-	[items setPreference:preferences];
+	[_items setPreference:_preferences];
 }
 	// Action
 - (BOOL)showImageWithURL:(NSURL *)imageURL