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

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-27 18:12:39 +0300 (Thu, 27 Aug 2009)
New Revision: 2030

Modified:
   trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java
Log:
Merge revs 2028:2029 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-08-27 15:01:35 UTC (rev 2029)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-08-27 15:12:39 UTC (rev 2030)
@@ -80,10 +80,14 @@
 			fileSize = getSizeFor(downloadPage, downloadFile.getDescriptor().getName());
 			remoteURL = getLinkFor(downloadPage, downloadFile.getDescriptor().getName());
 		} catch (MalformedURLException e) {
-			Activator.getErrorLogger().logAndShowError("Invalid file URL", e);
-			return null;
+			throw new MicaException("Invalid file URL on " + MaemoSDKVMInfo.DOWNLOAD_PAGE, e);
 		}
 				
+		if (remoteURL == null) {
+			throw new MicaException("Cannot locate ''" + downloadFile.getDescriptor().getName() 
+					+ "'' on " + MaemoSDKVMInfo.DOWNLOAD_PAGE);
+		}
+		
 		return new Tuple(remoteURL, fileSize);
 	}
 	
@@ -335,8 +339,9 @@
 				downloadFile.setSize(contentLength);
 			}
 			
-			CopyProgressMonitor progressMonitor = new CopyProgressMonitor("Downloading Maemo SDK virtual image",remoteFileSize, monitor);
-			progressMonitor.addProgress(downloadFile.getDownloadedSize());
+			CopyProgressMonitor progressMonitor = new CopyProgressMonitor(
+					"Downloading Maemo SDK virtual image", remoteFileSize, monitor);
+			progressMonitor.setExistingSize(downloadFile.getDownloadedSize());
 			progressMonitor.start();
 	
 			out = new RandomFileOutputStream(fileName,true);
@@ -347,7 +352,7 @@
 			monitor.beginTask(remoteURL.getFile(), remoteFileSize != 0 ? remoteFileSize : IProgressMonitor.UNKNOWN);
 			monitor.worked((int)downloadFile.getDownloadedSize());
 			
-			int bufferSize = 64*1054;//64KB
+			int bufferSize = 64*1024;//64KB
 			DownloadingThread thread = new DownloadingThread(in, out,bufferSize , progressMonitor, monitor);
 			thread.start();