[Esbox-commits] r2210 - branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards

[eswartz at garage.maemo.org]

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

Modified:
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java
Log:
Fix regular expression to match changes in the Maemo VM description.

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java	2009-09-22 14:00:27 UTC (rev 2209)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMInstallerContentLabelProvider.java	2009-09-22 14:09:54 UTC (rev 2210)
@@ -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;