replace URLByAppendingPathComponent:isDirectory: (requires 10.7) with URLByAppendingPathComponent: (requires 10.6)

David Catmull · David Catmull · commit d0480c82d443 · 2011-06-19T16:13:54.000-06:00
diff --git a/PBWebController.m b/PBWebController.m
@@ -37,9 +37,9 @@ - (void) awakeFromNib
 	[view setResourceLoadDelegate:self];
 
 	NSURL *resourceURL = [[[NSBundle mainBundle] resourceURL] URLByStandardizingPath];
-	NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views" isDirectory:YES] URLByAppendingPathComponent:startFile isDirectory:YES];
+	NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views"] URLByAppendingPathComponent:startFile];
 	
-	NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html" isDirectory:NO];
+	NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html"];
 	[[view mainFrame] loadRequest:[NSURLRequest requestWithURL:fileURL]];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ - (void) awakeFromNib`
`37`	`37`	`[view setResourceLoadDelegate:self];`
`38`	`38`
`39`	`39`	`NSURL *resourceURL = [[[NSBundle mainBundle] resourceURL] URLByStandardizingPath];`
`40`		`- NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views" isDirectory:YES] URLByAppendingPathComponent:startFile isDirectory:YES];`
	`40`	`+ NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views"] URLByAppendingPathComponent:startFile];`
`41`	`41`
`42`		`- NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html" isDirectory:NO];`
	`42`	`+ NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html"];`
`43`	`43`	`[[view mainFrame] loadRequest:[NSURLRequest requestWithURL:fileURL]];`
`44`	`44`	`}`
`45`	`45`