[Esbox-commits] r2212 - in trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal: api/vm/vmware vm/vmware/ui/wizards

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-09-22 17:43:22 +0300 (Tue, 22 Sep 2009)
New Revision: 2212

Modified:
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInfo.java
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java
Log:
Merge revs 2201:2211 from work_Ed branch

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-09-22 14:23:02 UTC (rev 2211)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-09-22 14:43:22 UTC (rev 2212)
@@ -19,6 +19,7 @@
 import java.net.CookieHandler;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.DecimalFormat;
 import java.util.regex.Matcher;
@@ -248,7 +249,13 @@
 	private File getLocalFile(URL remoteURL, URL installLocation) {
 		String fileName = (new Path(remoteURL.getFile())).lastSegment();
 		fileName = fileName.substring(fileName.lastIndexOf("=") + 1);
-		return new File ((new Path(installLocation.getFile())).append(fileName).toOSString());
+		String localPath;
+		try {
+			localPath = installLocation.toURI().getPath();
+		} catch (URISyntaxException e) {
+			localPath = installLocation.getFile().replaceAll("%20", " "); // HACK
+		}
+		return new File ((new Path(localPath)).append(fileName).toOSString());
 	}
 	
 	/**

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInfo.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInfo.java	2009-09-22 14:23:02 UTC (rev 2211)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInfo.java	2009-09-22 14:43:22 UTC (rev 2212)
@@ -11,6 +11,7 @@
 package org.maemo.esbox.internal.api.vm.vmware;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -120,7 +121,12 @@
 	}
 
 	private File internalResolveLocalFile(String fileName)  {
-		String path = getInstallLocation().getPath();
+		String path;
+		try {
+			path = getInstallLocation().toURI().getPath();
+		} catch (URISyntaxException e) {
+			path = getInstallLocation().getFile().replaceAll("%20", " "); // HACK
+		}
 		return new File(path, fileName);
 	}
 	

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java	2009-09-22 14:23:02 UTC (rev 2211)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java	2009-09-22 14:43:22 UTC (rev 2212)
@@ -128,11 +128,11 @@
 				String license = getLicense(content);
 				
 				Pattern maemoVMPattern = Pattern
-						.compile("Maemo(\\s)+SDK(\\s)+Virtual(\\s)+Image(\\s)+with(\\s)+Ubuntu(\\s)+(\\w)+(\\s)+([\\d]*\\.[\\d]*)(\\s)+(Server|Desktop)(\\s\\-(Part)\\s\\d)?");
+						.compile("(Maemo(?:\\w|\\s)+SDK\\s+Virtual\\s+Image(?:\\w|\\s)+Ubuntu(?:\\w|\\s)+(\\d+\\.\\d+)\\s+(Desktop|Server))((?:\\w|\\s)+Part\\s\\d)?");
 				Matcher matcher = maemoVMPattern.matcher(content);
 				while (matcher.find()) {
-					String virtualImageName = matcher.group(0);
-					String version = matcher.group(9);
+					String virtualImageName = matcher.group(1);
+					String version = matcher.group(2);
 					virtualImageName = processVirtualImageName(virtualImageName);
 					boolean isServer = virtualImageName.toLowerCase().contains("server");
 					String virtualImageDescription = isServer ? MaemoSDKVMDescription.SERVER_IMAGE_DESCRIPTION : MaemoSDKVMDescription.DESKTOP_IMAGE_DESCRIPTION;