[Esbox-commits] r1894 - branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware

[fabricioepa at garage.maemo.org]

Author: fabricioepa
Date: 2009-07-24 23:19:01 +0300 (Fri, 24 Jul 2009)
New Revision: 1894

Modified:
   branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
   branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java
Log:
Fixing pause resume problem

Modified: branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-07-24 14:58:39 UTC (rev 1893)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-07-24 20:19:01 UTC (rev 1894)
@@ -349,8 +349,8 @@
 			
 			DownloadingThread thread = new DownloadingThread(in, out, progressMonitor, monitor);
 			thread.start();
-				
-			while (!thread.isInterrupted()) {
+
+			while (!thread.isInterrupted() && thread.isAlive() ) {
 				try {
 					Thread.sleep(1000);
 				} catch (InterruptedException e) {
@@ -362,13 +362,21 @@
 					downloadFile.cancel();
 					throw new MicaException("Maemo SDK virtual image download was cancelled by user.");
 				}
-				if (!thread.isAlive()) {
-					// Downloading is done
-					downloadFile.complete();
-					break;
+				
+				if(downloadFile.getStatus() == MaemoSDKVMInfo.Status.PAUSED){
+					thread.doPause();
 				}
 				
+				if(downloadFile.getStatus() == MaemoSDKVMInfo.Status.DOWNLOADING){
+					thread.doResume();
+				}
 			}
+			
+			if (thread.isCompleted() &&
+					downloadFile.getDownloadedSize() == remoteFileSize.intValue()) {
+				downloadFile.complete();
+			}
+			
 			if (thread.getErrorMessage() != null) {
 				downloadFile.error();
 				throw new IOException(thread.getErrorMessage());

Modified: branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java	2009-07-24 14:58:39 UTC (rev 1893)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java	2009-07-24 20:19:01 UTC (rev 1894)
@@ -172,7 +172,7 @@
 		final IStatus[] statuses = { Activator.createStatus(IStatus.OK, "File " + fileName
 				+ " was properly uncompressed into " + destinationPath) } ;
 		
-		if (!haveEnoughFreeSpace(fileName,destinationPath)) {
+		if (fileName == null || !haveEnoughFreeSpace(fileName,destinationPath) ) {
 			return Activator.createStatus(IStatus.ERROR,"Cannot retrieve information about zipped Maemo SDK virtual image.");
 		}