[Esbox-commits] r2337 - in branches/work_Ed: org.maemo.esbox.product.repository-feature org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-10-22 01:43:05 +0300 (Thu, 22 Oct 2009)
New Revision: 2337

Modified:
   branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java
Log:
Merge rev 2327 from trunk

Modified: branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml	2009-10-21 22:28:18 UTC (rev 2336)
+++ branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml	2009-10-21 22:43:05 UTC (rev 2337)
@@ -10,7 +10,7 @@
    </description>
 
    <copyright>
-      Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
+      Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
 reserved.
    </copyright>
 

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java	2009-10-21 22:28:18 UTC (rev 2336)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMSelectionWizardPage.java	2009-10-21 22:43:05 UTC (rev 2337)
@@ -538,6 +538,10 @@
 			if(uncompressToolPage.shouldShowThisPage(fileToDownload.isMultipart(), fileToDownload.getSize()))
 				 return uncompressToolPage;
 		 }else{
+			 validateTextFields();
+			 if (!isPageComplete()){
+				 return null;
+			 }
 			 File f = new File(installData.getPathOfExistentVM());
 			 if(uncompressToolPage.shouldShowThisPage(DefaultVMZipExtractor.isMultipartFile(installData.getPathOfExistentVM()), f.length()))
 				 return uncompressToolPage;