[Esbox-commits] r2135 - 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-10 01:01:56 +0300 (Thu, 10 Sep 2009)
New Revision: 2135

Modified:
   branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/NewMaemoSDKVMWizard.java
Log:
Oops, lost a wizard page during the merge.

Modified: branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/NewMaemoSDKVMWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/NewMaemoSDKVMWizard.java	2009-09-09 21:46:16 UTC (rev 2134)
+++ branches/work_Ed/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/NewMaemoSDKVMWizard.java	2009-09-09 22:01:56 UTC (rev 2135)
@@ -10,14 +10,11 @@
  *******************************************************************************/
 package org.maemo.esbox.internal.vm.vmware.ui.wizards;
 
-import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
@@ -28,8 +25,6 @@
 import org.eclipse.ui.IWorkbench;
 import org.maemo.esbox.internal.api.vm.vmware.MaemoSDKVMInstaller;
 import org.maemo.esbox.internal.vm.vmware.Activator;
-import org.maemo.mica.common.core.Policy;
-import org.maemo.mica.common.core.ui.IProgressReporter;
 import org.maemo.mica.common.ui.dialogs.DialogUtils;
 import org.maemo.mica.internal.api.common.ui.wizards.WizardWorkProgressPageBase;
 
@@ -46,6 +41,7 @@
 	private MaemoSDKVMSelectionWizardPage targetPage;
 	private MaemoSDKVMInstallationWorkPage downloadUncompressWorkPage;
 	private MaemoSDKVMConfigurationWizardPage configurationPage;
+	private MaemoSDKVMUncompressInfoWizardPage uncompressToolPage;
 	private MaemoSDKVMLicenseWizardPage licensePage;
 	private MaemoSDKVMInstallData installData;
 	private int httpTimeout;
@@ -77,6 +73,8 @@
 	public void addPages() {
 		targetPage = new MaemoSDKVMSelectionWizardPage(this);
 		addPage(targetPage);
+		uncompressToolPage = new MaemoSDKVMUncompressInfoWizardPage(this);
+		addPage(uncompressToolPage);
 		configurationPage = new MaemoSDKVMConfigurationWizardPage(this);
 		addPage(configurationPage);
 		licensePage = new MaemoSDKVMLicenseWizardPage(this);
@@ -155,45 +153,6 @@
 		return true;
 	}
 	
-	protected IStatus __doWork() {
-
-		getWorkPage().showAndClearLog();
-
-		final IStatus[] statuses = { Policy.getCancelStatus(Activator
-				.getDefault()) };
-		try {
-			getContainer().run(true, true, new IRunnableWithProgress() {
-
-				public void run(IProgressMonitor monitor)
-						throws InvocationTargetException, InterruptedException {
-					
-					IStatus status = null;
-					
-					IProgressReporter reporter = getWorkPage().getProgressReporter();
-					
-					MaemoSDKVMInstaller vmInstaller = new MaemoSDKVMInstaller(installData);
-					
-					status = vmInstaller.installVirtualImage(((MaemoSDKVMInstallationWorkPage)getWorkPage()).getTimeout(), getShell(), monitor);
-					
-					if (status.matches(IStatus.CANCEL))
-						status = Activator.createErrorStatus("The Maemo SDK virtual image installation was canceled.", null);
-
-					if (status.matches(IStatus.CANCEL) || status.matches(IStatus.ERROR))
-						reporter.appendStreamText(status.getMessage(), true);
-					
-					statuses[0] = status;
-				}
-
-			});
-		} catch (Exception e) {
-			Activator.getErrorLogger().logAndShowError(e.getMessage(),
-					e.getCause());
-			statuses[0] = Activator.createErrorStatus("Maemo SDK virtual image installation failed unexpectedly",
-					e);
-		}
-		return statuses[0];
-	}
-
 	/**
 	 * Get the installation data that contains information to install Maemo SDK
 	 * virtual image.