[Esbox-commits] r2022 - trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware

[andregomes at garage.maemo.org]

Author: andregomes
Date: 2009-08-26 22:48:15 +0300 (Wed, 26 Aug 2009)
New Revision: 2022

Modified:
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/DownloadExecution.java
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
Log:
Merging with work_Andre r2020

Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/DownloadExecution.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/DownloadExecution.java	2009-08-26 19:42:26 UTC (rev 2021)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/DownloadExecution.java	2009-08-26 19:48:15 UTC (rev 2022)
@@ -92,8 +92,12 @@
 			}
 			
 			// If user cancels donwload, it does not tries anymore.
-			if (status != null && (status.matches(IStatus.CANCEL) || status.matches(IStatus.ERROR)))
-				break;
+			if (status != null && (status.matches(IStatus.CANCEL) || status.matches(IStatus.ERROR))){
+				if (status.matches(IStatus.CANCEL))
+					throw new MicaException("Maemo SDK virtual image download was cancelled by user.");
+				else
+					break;
+			}
 			else if ((status != null && status.isOK()))
 				return;
 		}

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-08-26 19:42:26 UTC (rev 2021)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-08-26 19:48:15 UTC (rev 2022)
@@ -359,8 +359,8 @@
 				
 				if (monitor.isCanceled()) {
 					thread.stopDownloading();
-					downloadFile.cancel();
-					throw new MicaException("Maemo SDK virtual image download was cancelled by user.");
+					downloadFile.cancel();					
+					return Status.CANCEL_STATUS;
 				}
 				
 				if(downloadFile.getStatus() == MaemoSDKVMInfo.Status.PAUSED){