[28908] users/rhwood/Pallet

[source_changes at macosforge.org]

Revision: 28908
          http://trac.macosforge.org/projects/macports/changeset/28908
Author:   rhwood at macports.org
Date:     2007-09-11 03:05:38 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
Replace internal method for getting the path to a PortIndex with use of [MPMacPorts pathToPortIndex] method.

Modified Paths:
--------------
    users/rhwood/Pallet/PortAuthority.h
    users/rhwood/Pallet/PortAuthority.m

Modified: users/rhwood/Pallet/PortAuthority.h
===================================================================
--- users/rhwood/Pallet/PortAuthority.h	2007-09-11 10:02:08 UTC (rev 28907)
+++ users/rhwood/Pallet/PortAuthority.h	2007-09-11 10:05:38 UTC (rev 28908)
@@ -96,7 +96,6 @@
 - (IBAction)portAuthoritySite:(id)sender;
 
 - (void)getPortIndexes;
-- (NSString *)pathToPortIndexWithSource:(NSString *)source;
 - (void)populatePortIndex;
 
 - (void)launchExecutableWithArguments:(NSMutableArray *)args;

Modified: users/rhwood/Pallet/PortAuthority.m
===================================================================
--- users/rhwood/Pallet/PortAuthority.m	2007-09-11 10:02:08 UTC (rev 28907)
+++ users/rhwood/Pallet/PortAuthority.m	2007-09-11 10:05:38 UTC (rev 28908)
@@ -121,7 +121,7 @@
 	sources = [[NSMutableDictionary alloc] init];
 	enumerator = [[macPorts sources] objectEnumerator];
 	while (source = [enumerator nextObject]) {
-		[sources setValue:[self pathToPortIndexWithSource:source] forKey:source];
+		[sources setValue:[macPorts pathToPortIndex:source] forKey:source];
 	}
 	if (portIndexes != nil) {
 		[portIndexes release];
@@ -129,20 +129,6 @@
 	portIndexes = [[NSDictionary alloc] initWithDictionary:sources copyItems:YES];
 }
 
-- (NSString *)pathToPortIndexWithSource:(NSString *)source
-{
-	NSMutableString *path;
-	NSRange range;
-	path = [[NSMutableString alloc] init];
-	range = [source rangeOfString:@"://"];
-	[path setString:[source substringFromIndex:(range.location + range.length)]];
-	// if the source URL is not a file:// type URL, prepend it with ${prefix}/var/macports/sources
-	if (![[source substringToIndex:4] isEqualToString:@"file"]) {
-		[path setString:[[[macPorts prefix] stringByAppendingPathComponent:@"var/macports/sources"] stringByAppendingPathComponent:path]];
-	}
-	return [path stringByAppendingPathComponent:@"PortIndex"];
-}
-
 - (void)parsePortIndex:(NSString *)index intoIndexObject:(id)indexObject
 {
 	NSString *file;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070911/55fcf86c/attachment.html