Commit: aa1117f03ce716aa3be49239bb5fec28eeebe7ec - BSIconSetComposer (git)

BathyScapheのアイコンセット生成＆適用ツール

Commit MetaInfo

• Revision: aa1117f03ce716aa3be49239bb5fec28eeebe7ec (tree)
• Zeit: 2012-05-31 23:17:50
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Mod] ソースコード整理

Ändern Zusammenfassung

• modified: ColorSet.m
• modified: IconSetComposer.m
• modified: IconSetDocument.m
• modified: IconTray-Dragging.m

Diff

--- a/ColorSet.m
+++ b/ColorSet.m
@@ -127,26 +127,10 @@ enum {
 
 -(void)sendingSetColor:(ColorType)colorType
 {
-	NSString *bsBundleID;
 	OSType type;
 	id targetColor;
-	id tempColor;
-	CGFloat red, green, blue, alpha;
 	OSStatus err;
 	
-	NSAppleEventDescriptor *ae;
-	
-	NSAppleEventDescriptor *bsDesc;
-	
-	NSAppleEventDescriptor *propDesc;
-	
-	NSAppleEventDescriptor *keyDataDesc;
-	
-	NSAppleEventDescriptor *colorDesc;
-	NSAppleEventDescriptor *redDesc;
-	NSAppleEventDescriptor *greenDesc;
-	NSAppleEventDescriptor *blueDesc;
-	
 	switch(colorType) {
 		case kTypeThreadsListColor:
 			type = 'brCo';
@@ -160,40 +144,39 @@ enum {
 	}
 	
 	/* set up BathyScaphe addr */
-	bsBundleID = [[IconSetComposer bathyScapheBundle] bundleIdentifier];
-	bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:bsBundleID];
+	NSString *bsBundleID = [[IconSetComposer bathyScapheBundle] bundleIdentifier];
+	NSAppleEventDescriptor *bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:bsBundleID];
 	
 	/* Setting color */
+	NSAppleEventDescriptor *colorDesc = [NSAppleEventDescriptor listDescriptor];;
 	if( targetColor ) {
-		tempColor = [targetColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+		CGFloat red, green, blue, alpha;
+		id tempColor = [targetColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 		[tempColor getRed:&red green:&green blue:&blue alpha:&alpha];
 		
-		redDesc = [NSAppleEventDescriptor descriptorWithFloat:red];
-		greenDesc = [NSAppleEventDescriptor descriptorWithFloat:green];
-		blueDesc = [NSAppleEventDescriptor descriptorWithFloat:blue];
+		NSAppleEventDescriptor *redDesc = [NSAppleEventDescriptor descriptorWithFloat:red];
+		NSAppleEventDescriptor *greenDesc = [NSAppleEventDescriptor descriptorWithFloat:green];
+		NSAppleEventDescriptor *blueDesc = [NSAppleEventDescriptor descriptorWithFloat:blue];
 		
 		colorDesc = [NSAppleEventDescriptor listDescriptor];
 		[colorDesc insertDescriptor:redDesc atIndex:1];
 		[colorDesc insertDescriptor:greenDesc atIndex:2];
 		[colorDesc insertDescriptor:blueDesc atIndex:3];
-	} else {
-		
-		colorDesc = [NSAppleEventDescriptor listDescriptor];
 	}
 	
 	/* create typeObjectSpecifier Descriptor */
-	keyDataDesc = [NSAppleEventDescriptor descriptorWithTypeCode:type];	
-	propDesc = [NSAppleEventDescriptor objectSpecifierWithDesiredClass:cProperty
-															 container:nil
-															   keyForm:formPropertyID
-															   keyData:keyDataDesc];
+	NSAppleEventDescriptor *keyDataDesc = [NSAppleEventDescriptor descriptorWithTypeCode:type];	
+	NSAppleEventDescriptor *propDesc = [NSAppleEventDescriptor objectSpecifierWithDesiredClass:cProperty
+																					 container:nil
+																					   keyForm:formPropertyID
+																					   keyData:keyDataDesc];
 	
 	/* create AppleEvent */
-	ae = [NSAppleEventDescriptor appleEventWithEventClass:kAECoreSuite
-												  eventID:kAESetData
-										 targetDescriptor:bsDesc
-												 returnID:kAutoGenerateReturnID
-											transactionID:kAnyTransactionID];
+	NSAppleEventDescriptor *ae = [NSAppleEventDescriptor appleEventWithEventClass:kAECoreSuite
+																		  eventID:kAESetData
+																 targetDescriptor:bsDesc
+																		 returnID:kAutoGenerateReturnID
+																	transactionID:kAnyTransactionID];
 	
 	[ae setParamDescriptor:colorDesc forKeyword:keyAEData];
 	[ae setParamDescriptor:propDesc forKeyword:keyDirectObject];
@@ -210,23 +193,12 @@ enum {
 }
 + (NSColor *)getBathyScapheColor:(ColorType)colorType
 {
-	NSString *bsBundleID;
 	OSType type;
 	id result = nil;
-	float red, green, blue;
 	OSStatus err;
 	
 	[[IconSetComposer sharedInstance] launchBS];
 	
-	NSAppleEventDescriptor *replyDesc;
-	NSAppleEventDescriptor *colorComponentsDesc;
-	NSAppleEventDescriptor *colorComponentDesc;
-	
-	NSAppleEventDescriptor *ae;
-	NSAppleEventDescriptor *bsDesc;
-	NSAppleEventDescriptor *propDesc;
-	NSAppleEventDescriptor *keyDataDesc;
-	
 	switch(colorType) {
 		case kTypeThreadsListColor:
 			type = 'brCo';
@@ -236,23 +208,23 @@ enum {
 	}
 	
 	/* set up BathyScaphe addr */
-	bsBundleID = [[IconSetComposer bathyScapheBundle] bundleIdentifier];
-	bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:bsBundleID];
+	NSString *bsBundleID = [[IconSetComposer bathyScapheBundle] bundleIdentifier];
+	NSAppleEventDescriptor *bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:bsBundleID];
 	
 	
 	/* create typeObjectSpecifier Descriptor */
-	keyDataDesc = [NSAppleEventDescriptor descriptorWithTypeCode:type];	
-	propDesc = [NSAppleEventDescriptor objectSpecifierWithDesiredClass:cProperty
-															 container:nil
-															   keyForm:formPropertyID
-															   keyData:keyDataDesc];
+	NSAppleEventDescriptor *keyDataDesc = [NSAppleEventDescriptor descriptorWithTypeCode:type];	
+	NSAppleEventDescriptor *propDesc = [NSAppleEventDescriptor objectSpecifierWithDesiredClass:cProperty
+																					 container:nil
+																					   keyForm:formPropertyID
+																					   keyData:keyDataDesc];
 	
 	/* create AppleEvent */
-	ae = [NSAppleEventDescriptor appleEventWithEventClass:kAECoreSuite
-												  eventID:kAEGetData
-										 targetDescriptor:bsDesc
-												 returnID:kAutoGenerateReturnID
-											transactionID:kAnyTransactionID];
+	NSAppleEventDescriptor *ae = [NSAppleEventDescriptor appleEventWithEventClass:kAECoreSuite
+																		  eventID:kAEGetData
+																 targetDescriptor:bsDesc
+																		 returnID:kAutoGenerateReturnID
+																	transactionID:kAnyTransactionID];
 	
 	[ae setParamDescriptor:propDesc forKeyword:keyDirectObject];
 	
@@ -260,7 +232,7 @@ enum {
 	NSLog(@"%@", ae);
 #endif
 	
-	
+	NSAppleEventDescriptor *replyDesc;
 	err = [ae sendAppleEventWithMode:kAECanInteract + kAEWaitReply
 					  timeOutInTicks:kAEDefaultTimeout
 							   reply:&replyDesc];
@@ -273,14 +245,14 @@ enum {
 #ifdef DEBUG
 	NSLog(@"%@", replyDesc);
 #endif
-	
-	colorComponentsDesc = [replyDesc paramDescriptorForKeyword:keyDirectObject];
+	NSAppleEventDescriptor *colorComponentDesc;
+	NSAppleEventDescriptor *colorComponentsDesc = [replyDesc paramDescriptorForKeyword:keyDirectObject];
 	colorComponentDesc = [colorComponentsDesc descriptorAtIndex:1];
-	red = [[colorComponentDesc stringValue] floatValue];
+	CGFloat red = [[colorComponentDesc stringValue] floatValue];
 	colorComponentDesc = [colorComponentsDesc descriptorAtIndex:2];
-	green = [[colorComponentDesc stringValue] floatValue];
+	CGFloat green = [[colorComponentDesc stringValue] floatValue];
 	colorComponentDesc = [colorComponentsDesc descriptorAtIndex:3];
-	blue = [[colorComponentDesc stringValue] floatValue];
+	CGFloat blue = [[colorComponentDesc stringValue] floatValue];
 	
 	result = [NSColor colorWithCalibratedRed:red green:green blue:blue alpha:1];
 	
@@ -333,15 +305,12 @@ enum {
 
 - (IBAction)changeColor:(id)sender
 {
-	int tag;
-	
 	if( ![sender respondsToSelector:@selector(tag)]
 		&& ![sender respondsToSelector:@selector(color)] ) {
 		return;
 	}
 	
-	tag = [sender tag];
-	switch(tag) {
+	switch([sender tag]) {
 		case ThreadsListColorTag:
 			[self setThreadsListColor:[sender color]];
 			break;
@@ -352,14 +321,11 @@ enum {
 
 - (IBAction)revertColor:(id)sender
 {
-	int tag;
-	
 	if( ![sender respondsToSelector:@selector(tag)] ) {
 		return;
 	}
 	
-	tag = [sender tag];
-	switch(tag) {
+	switch([sender tag]) {
 		case ThreadsListColorTag:
 			[self setThreadsListColor:nil];
 			break;
@@ -382,15 +348,12 @@ enum {
 }
 - (BOOL)setPlistURL:(NSURL *)url
 {
-	NSDictionary *dict;
-	NSColor *color;
-	
-	dict = [NSDictionary dictionaryWithContentsOfURL:url];
+	NSDictionary *dict = [NSDictionary dictionaryWithContentsOfURL:url];
 	if( !dict ) {
 		return NO;
 	}
 	
-	color = [NSColor colorWithPlist:[dict objectForKey:ThreadsListColorKey]];
+	NSColor *color = [NSColor colorWithPlist:[dict objectForKey:ThreadsListColorKey]];
 	[self setThreadsListColor:color];
 	
 	[self setIncludeColors:[[dict objectForKey:IncludeColorsKey] boolValue]];

--- a/IconSetComposer.m
+++ b/IconSetComposer.m
@@ -28,12 +28,11 @@ static IconSetComposer *_instance = nil;
 			  andDecrementals:(NSArray *)decrementalImages
 {
 	int result;
-	//
+	
 	NSString *title = NSLocalizedString( @"Caution!", @"Caution!" );
 	NSString *message = @"";
 	NSString *defaultCaption = NSLocalizedString( @"Quit", @"Quit" );
 	NSString *alternateCaption = NSLocalizedString( @"Continue", @"Continue" );
-//	NSString *otherCaption;
 	
 	NSString *tmpString;
 	NSString *inc = nil;
@@ -68,33 +67,25 @@ static IconSetComposer *_instance = nil;
 }
 -(BOOL)isSupportedBathyScaphe
 {
-	NSBundle *bsBundle;
-	NSString *bsResourcesPath;
-	NSArray *bsResources;
-	NSArray *knownBSSystemImages;
-	NSArray *managedImages;
-	unsigned managedImageNum;
-	unsigned bsResourceImageNum = 0;
-	id fm;
-	int status = 0;
-	NSMutableArray *incrementalImages = [NSMutableArray array];
-	NSMutableArray *decrementalImages = nil;
-	NSMutableArray *containsImages = [NSMutableArray array];
-	
-	bsBundle = [[self class] bathyScapheBundle];
+	NSBundle *bsBundle = [[self class] bathyScapheBundle];
 	if( !bsBundle ) {
 		return NO;
 	}
 	
-	fm = [NSFileManager defaultManager];
-	bsResourcesPath = [bsBundle resourcePath];
-	bsResources = [fm directoryContentsAtPath:bsResourcesPath];
+	NSUInteger bsResourceImageNum = 0;
+	NSInteger status = 0;
+	NSMutableArray *incrementalImages = [NSMutableArray array];
+	NSMutableArray *decrementalImages = nil;
+	NSMutableArray *containsImages = [NSMutableArray array];
+	id fm = [NSFileManager defaultManager];
+	NSString *bsResourcesPath = [bsBundle resourcePath];
+	NSArray *bsResources = [fm directoryContentsAtPath:bsResourcesPath];
 	
-	managedImages = [IconSetDocument managedImageNames];
-	managedImageNum = [managedImages count];
+	NSArray *managedImages = [IconSetDocument managedImageNames];
+	NSUInteger managedImageNum = [managedImages count];
 	
-	knownBSSystemImages = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"BathyScapheSystemImages"
-																						   ofType:@"plist"]];
+	NSArray *knownBSSystemImages = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"BathyScapheSystemImages"
+																									ofType:@"plist"]];
 	
 	for(NSString *filename in bsResources) {		
 		if( [[self class] isAcceptImageExtension:[filename pathExtension]] ) {
@@ -137,11 +128,8 @@ static IconSetComposer *_instance = nil;
 
 +(NSBundle *)bathyScapheBundle
 {
-	NSString *bsPath;
-	NSBundle *bsBundle;
-	
-	bsPath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:[self bathyScapheIdentifier]];
-	bsBundle = [NSBundle bundleWithPath:bsPath];
+	NSString *bsPath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:[self bathyScapheIdentifier]];
+	NSBundle *bsBundle = [NSBundle bundleWithPath:bsPath];
 	
 	return bsBundle;
 }
@@ -199,7 +187,7 @@ final:
 {
 	static NSString *result = nil;
 	
-	if(  !result ) {
+	if( !result ) {
 		NSArray *dirs = NSSearchPathForDirectoriesInDomains( NSApplicationSupportDirectory, NSUserDomainMask, YES );
 		NSString *tmp;
 		
@@ -219,7 +207,7 @@ final:
 {
 	static NSString *result = nil;
 	
-	if(  !result ) {
+	if( !result ) {
 		NSString *tmp;
 		
 		result = [self bathyScapheSupportFolder];
@@ -261,12 +249,8 @@ final:
 +(NSImage *)defaultImageForIdentifier:(NSString *)identifier
 {
 	NSBundle *bsBundle = [self bathyScapheBundle];
-	
-	NSString *path;
-	NSImage *image;
-	
-	path = [bsBundle pathForImageResource:identifier];
-	image = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
+	NSString *path = [bsBundle pathForImageResource:identifier];
+	NSImage *image = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
 	
 	return image;
 }
@@ -345,19 +329,16 @@ final:
 -(long)quitBS
 {
 	OSStatus err;
-	NSAppleEventDescriptor *ae;
-	NSAppleEventDescriptor *bsDesc;
 	
 	/* set up BathyScaphe addr */
-	bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:[self bathyScapheIdentifier]];
+	NSAppleEventDescriptor *bsDesc = [NSAppleEventDescriptor targetDescriptorWithApplicationIdentifier:[self bathyScapheIdentifier]];
 	
-	ae = [NSAppleEventDescriptor appleEventWithEventClass:kCoreEventClass
-												  eventID:kAEQuitApplication
-										 targetDescriptor:bsDesc
-												 returnID:kAutoGenerateReturnID
-											transactionID:kAnyTransactionID];
+	NSAppleEventDescriptor *ae = [NSAppleEventDescriptor appleEventWithEventClass:kCoreEventClass
+																		  eventID:kAEQuitApplication
+																 targetDescriptor:bsDesc
+																		 returnID:kAutoGenerateReturnID
+																	transactionID:kAnyTransactionID];
 	
-//	err = AESendMessage( [ae aeDesc], NULL, kAECanInteract, kAEDefaultTimeout );
 	err = [ae sendAppleEventWithMode:kAECanInteract | kAEWaitReply
 					  timeOutInTicks:kAEDefaultTimeout
 							   reply:NULL];
@@ -404,14 +385,9 @@ final:
 }
 -(IBAction)createDocumentFromCurrentSetting:(id)sender
 {
-	NSString *bsSupPath = [[self class] bathyScapheSupportFolder];
-	NSBundle *bsSupBundle;
 	NSArray *imageNames = [IconSetDocument managedImageNames];
-	NSString *imagePath;
-	
-	IconSetDocument *newDocument;
-	
-	bsSupBundle = [NSBundle bundleWithPath:bsSupPath];
+	NSString *bsSupPath = [[self class] bathyScapheSupportFolder];
+	NSBundle *bsSupBundle = [NSBundle bundleWithPath:bsSupPath];
 	
 	if(!imageNames || !bsSupBundle) {
 		NSLog(@"HOGE!!");
@@ -419,9 +395,8 @@ final:
 		return;
 	}
 	
-	newDocument = [[NSDocumentController sharedDocumentController]
-		openUntitledDocumentOfType:@"IconSetType"
-						   display:NO];
+	IconSetDocument *newDocument = [[NSDocumentController sharedDocumentController] openUntitledDocumentOfType:@"IconSetType"
+																									   display:NO];
 	if(!newDocument) {
 		NSLog(@"Can not create new document.");
 		NSBeep();
@@ -429,7 +404,7 @@ final:
 	}
 	
 	for(NSString *imageName in imageNames) {
-		imagePath = [bsSupBundle pathForImageResource:imageName];
+		NSString *imagePath = [bsSupBundle pathForImageResource:imageName];
 		[newDocument setPath:imagePath forIdentifier:imageName];
 	}
 	

--- a/IconSetDocument.m
+++ b/IconSetDocument.m
@@ -285,14 +285,12 @@ static NSArray *sThreadIdentifiers;
 
 -(void)didChangeColorSet:(ColorSet *)set
 {
-	NSString *identifier;
-	NSDictionary *plist;
 	NSFileWrapper *fw;
 	NSString *path;
 	TemporaryFolder *t = [TemporaryFolder temporaryFolder];
 	
-	identifier = [set identifier];
-	plist = [set plist];
+	NSString *identifier = [set identifier];
+	NSDictionary *plist = [set plist];
 	if( !plist && ![plist respondsToSelector:@selector(writeToFile:atomically:)] ) {
 		return;
 	}
@@ -451,31 +449,23 @@ static NSArray *sThreadIdentifiers;
 
 -(void)updateAll
 {
-	id keys = [[wrapper fileWrappers] keyEnumerator];
-	id identifier;
-	
-	while( identifier = [keys nextObject] ) {
+	for(id identifier in [wrapper fileWrappers]) {
 		identifier = [identifier stringByDeletingPathExtension];
 		[self updateForKey:identifier];
 	}
 }
 -(void)updateForKey:(NSString *)key
 {
-	NSImage *image;
-	NSFileWrapper *fw;
-	NSData *data;
-	NSString *filename;
-	
-	fw = [self fileWrapperForIdentifier:key];
+	NSFileWrapper *fw = [self fileWrapperForIdentifier:key];
 	if( !fw ) {
 //		NSLog(@"can't load image for %@", key);
 		return;
 	}
 	
-	data = [fw regularFileContents];
-	image = [[[NSImage alloc] initWithData:data] autorelease];
+	NSData *data = [fw regularFileContents];
+	NSImage *image = [[[NSImage alloc] initWithData:data] autorelease];
 	if( !image ) {
-		filename = [fw filename];
+		NSString *filename = [fw filename];
 		if( !filename ) return;
 		NSURL *bundleURL = [self fileURL];
 		NSURL *colorSetURL = [bundleURL URLByAppendingPathComponent:filename];
@@ -505,31 +495,23 @@ static NSArray *sThreadIdentifiers;
 
 -(void)applyAndRestartBathyScaphe:(id)sender
 {
-	NSScriptCommandDescription *desc;
-	NSScriptCommand *command;
-	
-	desc = [[NSScriptSuiteRegistry sharedScriptSuiteRegistry] commandDescriptionWithAppleEventClass:'bSiS'
-																				  andAppleEventCode:'bSaP'];
-	command = [desc createCommandInstance];
-	
+	NSScriptCommandDescription *desc = [[NSScriptSuiteRegistry sharedScriptSuiteRegistry] commandDescriptionWithAppleEventClass:'bSiS'
+																											  andAppleEventCode:'bSaP'];
+	NSScriptCommand *command = [desc createCommandInstance];
 	[command setDirectParameter:[self objectSpecifier]];
-	
 	[command executeCommand];
 }
 
 -(void)changeFileOfImage:(NSFileWrapper *)imageFileWrapper forIdentifier:(NSString *)identifier
 {
-	NSFileWrapper *fw;
-	NSString *filename;
-	
-	filename = [imageFileWrapper preferredFilename];
+	NSString *filename = [imageFileWrapper preferredFilename];
 	
 	if(filename && ![[filename stringByDeletingPathExtension] isEqualTo:identifier] ) {
 		filename = [identifier stringByAppendingPathExtension:[filename pathExtension]];
 		[imageFileWrapper setPreferredFilename:filename];
 	}
 	
-	fw = [self fileWrapperForIdentifier:identifier];
+	NSFileWrapper *fw = [self fileWrapperForIdentifier:identifier];
 	if( fw ) {
 		if( [fw isEqual:imageFileWrapper] ) {
 			return;

--- a/IconTray-Dragging.m
+++ b/IconTray-Dragging.m
@@ -46,21 +46,14 @@
 }
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
-	NSPasteboard *pb;
-	NSArray *paths;
-	NSString *path;
-	NSArray *types;
 	id oldImage = [self image];
-	
-	//	NSLog(@"Enter %@.", NSStringFromSelector(_cmd));
-	
-	pb = [sender draggingPasteboard];
-	types = [pb types];
+	NSPasteboard *pb = [sender draggingPasteboard];
+	NSArray *types = [pb types];
 	
 	if([types containsObject:NSFilesPromisePboardType]) {
 		TemporaryFolder *tmp = [self temporaryFolder];
-		paths = [sender namesOfPromisedFilesDroppedAtDestination:[tmp url]];
-		path = [paths objectAtIndex:0];
+		NSArray *paths = [sender namesOfPromisedFilesDroppedAtDestination:[tmp url]];
+		NSString *path = [paths objectAtIndex:0];
 		
 		path = [[tmp path] stringByAppendingPathComponent:path];
 		[self setImageFilePath:path];