Wed Aug 5 21:08:37 EEST 2009

Author: fabricioepa
Date: 2009-08-05 21:08:34 +0300 (Wed, 05 Aug 2009)
New Revision: 1943

Added:
   branches/work_Raul/org.maemo.esbox.vm.ui/.settings/
   branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.jdt.core.prefs
   branches/work_Raul/org.maemo.esbox.vm.ui/META-INF/
   branches/work_Raul/org.maemo.esbox.vm.ui/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.vm.ui/about_files/
   branches/work_Raul/org.maemo.esbox.vm.ui/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine.png
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_48.png
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_64.png
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/wizban/
   branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/wizban/virtual_machine_wiz.png
   branches/work_Raul/org.maemo.esbox.vm.ui/src/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/SelectVirtualMachineDialog.java
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/UIActivator.java
   branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/vm/
Removed:
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
Modified:
   branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.vm.ui/
   branches/work_Raul/org.maemo.esbox.vm.vmware/META-INF/MANIFEST.MF
   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
   branches/work_Raul/org.maemo.esbox.vm/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/VirtualBuildMachineConfigurationHandler.java
Log:
moving vm UI widgets

Modified: branches/work_Raul/org.maemo.esbox.vm/META-INF/MANIFEST.MF
===================================================================

--- branches/work_Raul/org.maemo.esbox.vm/META-INF/MANIFEST.MF	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/META-INF/MANIFEST.MF	2009-08-05 18:08:34 UTC (rev 1943)
@@ -14,12 +14,11 @@
  org.eclipse.ui.ide;bundle-version="3.4.1",
  org.maemo.esbox.maemosdk.ui;bundle-version="2.0.0";visibility:=reexport,
  org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.ui;bundle-version="2.0.0"
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
+ org.maemo.esbox.vm.ui;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.maemo.esbox.internal.api.vm.core,
- org.maemo.esbox.internal.api.vm.ui,
- org.maemo.esbox.internal.api.vm.ui.preferences,
+  org.maemo.esbox.internal.api.vm.ui.preferences,
  org.maemo.esbox.internal.vm;x-friends:="org.maemo.esbox.vm.tests",
- org.maemo.esbox.vm.core,
- org.maemo.esbox.vm.ui
+ org.maemo.esbox.vm.core

Modified: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -29,6 +29,7 @@
 import org.maemo.esbox.internal.api.vm.ui.SlowVirtualMachineLaunchMonitorDialog;
 import org.maemo.esbox.internal.api.vm.ui.SynchronizedProgressPartProgressMonitor;
 import org.maemo.esbox.internal.vm.Activator;
+import org.maemo.esbox.internal.vm.ui.UIActivator;
 import org.maemo.esbox.vm.core.IVirtualMachineConfiguration;
 import org.maemo.mica.common.core.Policy;
 import org.maemo.mica.common.core.WorkspaceUtils;
@@ -220,7 +221,7 @@
 				null, 
 				"Machine Startup Problem",
 				
-				Activator.getImageDescriptor("icons/full/etool16/virtual_machine_64.png").createImage(),
+				UIActivator.getImageDescriptor("icons/full/etool16/virtual_machine_64.png").createImage(),
 				
 				MessageFormat.format("Cannot start or connect to virtual machine ''{0}''",
 						getName()),

Deleted: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.api.vm.ui;
-
-import java.text.MessageFormat;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.maemo.mica.common.core.ProductUtils;
-import org.maemo.mica.common.core.machine.IMachine;
-import org.maemo.mica.common.core.machine.IMachineController;
-import org.maemo.mica.internal.api.common.core.ui.LookHereMessageWidget;
-import org.maemo.mica.internal.api.protocol.ssh.SSHMachineControllerBase;
-import org.maemo.mica.protocol.ssh.SSHConfiguration;
-
-/**
- * This dialog will come up after a "long" time has passed, letting the user
- * know what to do if it doesn't seem like it will ever finish.
- * @author eswartz
- *
- */
-public class SlowVirtualMachineLaunchMonitorDialog extends MessageDialog {
-
-	/**
-	 * 
-	 */
-	private final IMachineController machineController;
-	protected LookHereMessageWidget lookHere;
-	private Timer timer;
-	private final IProgressMonitor monitor;
-	private ProgressMonitorPart progressPart;
-	private final IMachine machine;
-	
-	public SlowVirtualMachineLaunchMonitorDialog(
-			IMachine machine_, IMachineController machineController, Shell parent,
-			int longOperationTime, IProgressMonitor monitor) {
-		super(parent, "Launching Virtual Machine", null,
-				"Launching " + machine_.getName() + "...",
-				MessageDialog.INFORMATION,
-				new String[] { IDialogConstants.OK_LABEL },
-				0);
-		this.machine = machine_;
-		this.monitor = monitor;
-		
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		setBlockOnOpen(false);
-		
-		this.machineController = machineController;
-		
-		timer = new Timer(true);
-		timer.schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						open();
-						getShell().pack();
-					}
-				});
-				
-				timer.scheduleAtFixedRate(new TimerTask() {
-
-					@Override
-					public void run() {
-						// go away once it's alive
-						if (machine.isAlive()) {
-							Display.getDefault().asyncExec(new Runnable() {
-								public void run() {
-									close();
-								}
-							});	
-						}
-					}
-					
-				}, 0, 500);
-				
-			}
-			
-		}, longOperationTime);
-		
-		// create immediately but do not open until later
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				create();
-				getButton(IDialogConstants.OK_ID).setText(IDialogConstants.CLOSE_LABEL);
-			}
-		});
-				
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#getInitialSize()
-	 */
-	@Override
-	protected Point getInitialSize() {
-		return new Point(500, 500);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#close()
-	 */
-	@Override
-	public boolean close() {
-		if (timer != null) {
-			timer.cancel();
-			timer = null;
-		}
-		return super.close();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createMessageArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createMessageArea(Composite parent) {
-		Composite composite = (Composite) super.createMessageArea(parent);
-		
-		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER)
-			.applyTo(this.imageLabel);
-		
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP)
-			.align(SWT.LEFT, SWT.BEGINNING)
-			.applyTo(messageLabel);
-
-		Group group = new Group(composite, SWT.SHADOW_IN);
-		GridDataFactory.fillDefaults().span(2, 1).applyTo(group);
-		group.setLayout(new GridLayout());
-		
-		StringBuilder builder = new StringBuilder();
-		// the weird spaces are for OS X 
-		builder.append("The virtual machine is still launching but is not accessible yet.\n \n");
-		builder.append("If the machine boots successfully but this dialog doesn't go away, then the network settings may need to be synchronized.\n \n");
-		
-		if (machineController instanceof SSHMachineControllerBase) {
-			SSHConfiguration config = ((SSHMachineControllerBase) machineController).getConfiguration();
-			builder.append(MessageFormat.format(
-					"{0} expects to connect to the machine at address {1}:{2}, and for the machine to talk back to the host at address {3} (which you can verify with a ping).\n \n",
-					ProductUtils.getProductName(),
-					config.getTargetAddress(), config.getTargetPort() + "",
-					config.getHostAddress()));
-		}
-		
-		builder.append("A Maemo SDK virtual image runs 'dhclient' at the end of its boot sequence; you should see the Target IP Address 'bound to' in the console.");
-		
-		lookHere = new LookHereMessageWidget(group, 
-				builder.toString(),
-				machineController.createLookHereProviders());
-		
-		lookHere.setLinkSelectedListener(new LookHereMessageWidget.LinkSelectedListener() {
-
-			public void notifyLinkSelected() {
-				monitor.setCanceled(true);
-				close();
-			}
-			
-		});
-		
-		progressPart = new ProgressMonitorPart(composite, null); 
-		GridDataFactory.fillDefaults().span(2, 1).applyTo(progressPart);
-
-		progressPart.beginTask("Waiting...", IProgressMonitor.UNKNOWN);
-		
-		return composite;
-	}
-	
-	public ProgressMonitorPart getProgressPart() {
-		return progressPart;
-	}
-	
-}
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.api.vm.ui;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This is a progress monitor and progress part synchronizer.  The
- * progress part must be updated on the UI thread.
- * @author eswartz
- *
- */
-public final class SynchronizedProgressPartProgressMonitor implements
-		IProgressMonitor {
-	private ProgressMonitorPart progressPart;
-	private final IProgressMonitor monitor;
-
-	public SynchronizedProgressPartProgressMonitor(ProgressMonitorPart progressPart, IProgressMonitor monitor) {
-		this.progressPart = progressPart;
-		this.monitor = monitor;
-	}
-	
-	public void setProgressPart(ProgressMonitorPart progressPart) {
-		this.progressPart = progressPart;
-	}
-	
-	public void beginTask(final String name, final int totalWork) {
-		monitor.beginTask(name, totalWork);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.beginTask(name, totalWork);
-				}
-			});
-	}
-
-	public void done() {
-		monitor.done();
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.done();
-				}
-			});
-		
-	}
-
-	public void internalWorked(final double work) {
-		monitor.internalWorked(work);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.internalWorked(work);
-				}
-			});
-		
-	}
-
-	public boolean isCanceled() {
-		return monitor.isCanceled();
-		/*
-		if (monitor.isCanceled())
-			return true;
-		final boolean[] canceled =  { false };
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (!progressPart.isDisposed())
-					canceled[0] = progressPart.isCanceled();
-			}
-		});
-		return canceled[0];
-		*/
-	}
-
-	public void setCanceled(final boolean value) {
-		monitor.setCanceled(value);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.setCanceled(value);
-				}
-			});
-	}
-
-	public void setTaskName(final String name) {
-		monitor.setTaskName(name);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.setTaskName(name);
-				}
-			});				
-	}
-
-	public void subTask(final String name) {
-		monitor.subTask(name);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.subTask(name);
-				}
-			});				
-	}
-
-	public void worked(final int work) {
-		monitor.worked(work);
-		if (progressPart != null)
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					if (!progressPart.isDisposed())
-						progressPart.worked(work);
-				}
-			});					
-	}
-}
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -19,7 +19,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.maemo.mica.common.core.ErrorLogger;
@@ -137,17 +136,6 @@
 		}
 	}
 	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IStartup#earlyStartup()
 	 */

Modified: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/VirtualBuildMachineConfigurationHandler.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/VirtualBuildMachineConfigurationHandler.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/VirtualBuildMachineConfigurationHandler.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -15,7 +15,7 @@
 
 import org.eclipse.swt.widgets.Display;
 import org.maemo.esbox.vm.core.IVirtualMachine;
-import org.maemo.esbox.vm.ui.SelectVirtualMachineDialog;
+import org.maemo.esbox.internal.vm.ui.SelectVirtualMachineDialog;
 import org.maemo.mica.common.core.machine.*;
 
 /**

Deleted: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.vm.ui;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.maemo.esbox.internal.vm.Activator;
-import org.maemo.mica.common.core.ProductUtils;
-
-/**
- * This dialog tells the user that a build machine should be selected.
- * @author eswartz
- *
- */
-public class SelectVirtualMachineDialog extends MessageDialogWithToggle {
-
-	public static final String BUILD_MACHINE_PREFS_ID = "org.maemo.esbox.maemosdk.ui.preferencePage.buildMachines";
-	public static final String ESBOX_PREFERENCE_CATEGORY_ID = "org.maemo.esbox.ui.preferenceCategory.esbox";
-	
-	private static final String BUG_ME_NOT = "SelectBuildMachineDialog.BugMeNot";
-
-	/**
-	 * 
-	 */
-	public SelectVirtualMachineDialog(Shell shell) {
-		super(shell, "Select Build Machine", null,
-				// note: UI is added below to provide a hyperlink
-				ProductUtils.getProductName() + " needs to know what machine to use to build and launch your code. \n\n"+
-				"Your system cannot directly launch scratchbox or Maemo tools, so a virtual machine running 32-bit Linux/i386 must be used.\n\n"+
-				"Please configure the settings by clicking the link below.",
-				MessageDialog.INFORMATION,
-				new String[] { IDialogConstants.OK_LABEL },
-				0,
-				"Do not remind me again",
-				Activator.getDefault().getPreferenceStore().getBoolean(BUG_ME_NOT));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createMessageArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createMessageArea(Composite composite) {
-		Composite msgArea = (Composite) super.createMessageArea(composite);
-		
-		// two-column layout...
-		new Label(msgArea, SWT.NONE);
-		
-		Link link = new Link(msgArea, SWT.NONE);
-		link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-		link.setText("<a href=\"link\">Go to Build Machine preferences...</a>");
-		
-		link.addSelectionListener(new SelectionAdapter() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				SelectVirtualMachineDialog.this.close();
-				PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(
-						getShell(), 
-						BUILD_MACHINE_PREFS_ID,
-						new String[] { 
-								ESBOX_PREFERENCE_CATEGORY_ID,
-								BUILD_MACHINE_PREFS_ID, 
-							},
-						null);
-				dialog.open();
-			}
-		});
-		return msgArea;
-	}
-	
-}

Modified: branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml	2009-08-05 18:08:34 UTC (rev 1943)
@@ -58,4 +58,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.maemo.esbox.vm.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>


Property changes on: branches/work_Raul/org.maemo.esbox.vm.ui
___________________________________________________________________
Name: svn:ignore
   + bin


Added: branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.core.resources.prefs
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.core.resources.prefs	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,3 @@
+#Wed Aug 05 15:06:29 GMT-03:00 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Added: branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/.settings/org.eclipse.jdt.core.prefs	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,7 @@
+#Tue Aug 04 12:24:52 GMT-03:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

Added: branches/work_Raul/org.maemo.esbox.vm.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/META-INF/MANIFEST.MF	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox Virtual Machine Support UI Plug-in
+Bundle-SymbolicName: org.maemo.esbox.vm.ui
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.vm.ui.UIActivator
+Bundle-Vendor: INdT / Nokia
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.protocol.ssh;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.maemo.esbox.internal.api.vm.ui,
+ org.maemo.esbox.internal.vm.ui

Added: branches/work_Raul/org.maemo.esbox.vm.ui/about_files/epl-v10.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/about_files/epl-v10.html	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Added: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine.png
===================================================================
(Binary files differ)


Property changes on: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_48.png
===================================================================
(Binary files differ)


Property changes on: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_48.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_64.png
===================================================================
(Binary files differ)


Property changes on: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/etool16/virtual_machine_64.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/wizban/virtual_machine_wiz.png
===================================================================
(Binary files differ)


Property changes on: branches/work_Raul/org.maemo.esbox.vm.ui/icons/full/wizban/virtual_machine_wiz.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.api.vm.ui;
+
+import java.text.MessageFormat;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.maemo.mica.common.core.ProductUtils;
+import org.maemo.mica.common.core.machine.IMachine;
+import org.maemo.mica.common.core.machine.IMachineController;
+import org.maemo.mica.internal.api.common.core.ui.LookHereMessageWidget;
+import org.maemo.mica.internal.api.protocol.ssh.SSHMachineControllerBase;
+import org.maemo.mica.protocol.ssh.SSHConfiguration;
+
+/**
+ * This dialog will come up after a "long" time has passed, letting the user
+ * know what to do if it doesn't seem like it will ever finish.
+ * @author eswartz
+ *
+ */
+public class SlowVirtualMachineLaunchMonitorDialog extends MessageDialog {
+
+	/**
+	 * 
+	 */
+	private final IMachineController machineController;
+	protected LookHereMessageWidget lookHere;
+	private Timer timer;
+	private final IProgressMonitor monitor;
+	private ProgressMonitorPart progressPart;
+	private final IMachine machine;
+	
+	public SlowVirtualMachineLaunchMonitorDialog(
+			IMachine machine_, IMachineController machineController, Shell parent,
+			int longOperationTime, IProgressMonitor monitor) {
+		super(parent, "Launching Virtual Machine", null,
+				"Launching " + machine_.getName() + "...",
+				MessageDialog.INFORMATION,
+				new String[] { IDialogConstants.OK_LABEL },
+				0);
+		this.machine = machine_;
+		this.monitor = monitor;
+		
+		setShellStyle(getShellStyle() | SWT.RESIZE);
+		setBlockOnOpen(false);
+		
+		this.machineController = machineController;
+		
+		timer = new Timer(true);
+		timer.schedule(new TimerTask() {
+
+			@Override
+			public void run() {
+				Display.getDefault().asyncExec(new Runnable() {
+					public void run() {
+						open();
+						getShell().pack();
+					}
+				});
+				
+				timer.scheduleAtFixedRate(new TimerTask() {
+
+					@Override
+					public void run() {
+						// go away once it's alive
+						if (machine.isAlive()) {
+							Display.getDefault().asyncExec(new Runnable() {
+								public void run() {
+									close();
+								}
+							});	
+						}
+					}
+					
+				}, 0, 500);
+				
+			}
+			
+		}, longOperationTime);
+		
+		// create immediately but do not open until later
+		Display.getDefault().syncExec(new Runnable() {
+			public void run() {
+				create();
+				getButton(IDialogConstants.OK_ID).setText(IDialogConstants.CLOSE_LABEL);
+			}
+		});
+				
+	}
+	
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.Dialog#getInitialSize()
+	 */
+	@Override
+	protected Point getInitialSize() {
+		return new Point(500, 500);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.Dialog#close()
+	 */
+	@Override
+	public boolean close() {
+		if (timer != null) {
+			timer.cancel();
+			timer = null;
+		}
+		return super.close();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createMessageArea(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Control createMessageArea(Composite parent) {
+		Composite composite = (Composite) super.createMessageArea(parent);
+		
+		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER)
+			.applyTo(this.imageLabel);
+		
+		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP)
+			.align(SWT.LEFT, SWT.BEGINNING)
+			.applyTo(messageLabel);
+
+		Group group = new Group(composite, SWT.SHADOW_IN);
+		GridDataFactory.fillDefaults().span(2, 1).applyTo(group);
+		group.setLayout(new GridLayout());
+		
+		StringBuilder builder = new StringBuilder();
+		// the weird spaces are for OS X 
+		builder.append("The virtual machine is still launching but is not accessible yet.\n \n");
+		builder.append("If the machine boots successfully but this dialog doesn't go away, then the network settings may need to be synchronized.\n \n");
+		
+		if (machineController instanceof SSHMachineControllerBase) {
+			SSHConfiguration config = ((SSHMachineControllerBase) machineController).getConfiguration();
+			builder.append(MessageFormat.format(
+					"{0} expects to connect to the machine at address {1}:{2}, and for the machine to talk back to the host at address {3} (which you can verify with a ping).\n \n",
+					ProductUtils.getProductName(),
+					config.getTargetAddress(), config.getTargetPort() + "",
+					config.getHostAddress()));
+		}
+		
+		builder.append("A Maemo SDK virtual image runs 'dhclient' at the end of its boot sequence; you should see the Target IP Address 'bound to' in the console.");
+		
+		lookHere = new LookHereMessageWidget(group, 
+				builder.toString(),
+				machineController.createLookHereProviders());
+		
+		lookHere.setLinkSelectedListener(new LookHereMessageWidget.LinkSelectedListener() {
+
+			public void notifyLinkSelected() {
+				monitor.setCanceled(true);
+				close();
+			}
+			
+		});
+		
+		progressPart = new ProgressMonitorPart(composite, null); 
+		GridDataFactory.fillDefaults().span(2, 1).applyTo(progressPart);
+
+		progressPart.beginTask("Waiting...", IProgressMonitor.UNKNOWN);
+		
+		return composite;
+	}
+	
+	public ProgressMonitorPart getProgressPart() {
+		return progressPart;
+	}
+	
+}
\ No newline at end of file

Added: branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.api.vm.ui;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This is a progress monitor and progress part synchronizer.  The
+ * progress part must be updated on the UI thread.
+ * @author eswartz
+ *
+ */
+public final class SynchronizedProgressPartProgressMonitor implements
+		IProgressMonitor {
+	private ProgressMonitorPart progressPart;
+	private final IProgressMonitor monitor;
+
+	public SynchronizedProgressPartProgressMonitor(ProgressMonitorPart progressPart, IProgressMonitor monitor) {
+		this.progressPart = progressPart;
+		this.monitor = monitor;
+	}
+	
+	public void setProgressPart(ProgressMonitorPart progressPart) {
+		this.progressPart = progressPart;
+	}
+	
+	public void beginTask(final String name, final int totalWork) {
+		monitor.beginTask(name, totalWork);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.beginTask(name, totalWork);
+				}
+			});
+	}
+
+	public void done() {
+		monitor.done();
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.done();
+				}
+			});
+		
+	}
+
+	public void internalWorked(final double work) {
+		monitor.internalWorked(work);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.internalWorked(work);
+				}
+			});
+		
+	}
+
+	public boolean isCanceled() {
+		return monitor.isCanceled();
+		/*
+		if (monitor.isCanceled())
+			return true;
+		final boolean[] canceled =  { false };
+		Display.getDefault().asyncExec(new Runnable() {
+			public void run() {
+				if (!progressPart.isDisposed())
+					canceled[0] = progressPart.isCanceled();
+			}
+		});
+		return canceled[0];
+		*/
+	}
+
+	public void setCanceled(final boolean value) {
+		monitor.setCanceled(value);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.setCanceled(value);
+				}
+			});
+	}
+
+	public void setTaskName(final String name) {
+		monitor.setTaskName(name);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.setTaskName(name);
+				}
+			});				
+	}
+
+	public void subTask(final String name) {
+		monitor.subTask(name);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.subTask(name);
+				}
+			});				
+	}
+
+	public void worked(final int work) {
+		monitor.worked(work);
+		if (progressPart != null)
+			Display.getDefault().asyncExec(new Runnable() {
+				public void run() {
+					if (!progressPart.isDisposed())
+						progressPart.worked(work);
+				}
+			});					
+	}
+}
\ No newline at end of file

Added: branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/SelectVirtualMachineDialog.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/SelectVirtualMachineDialog.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/SelectVirtualMachineDialog.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2008-2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.vm.ui;
+
+import org.eclipse.jface.dialogs.*;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.maemo.esbox.internal.vm.ui.UIActivator;
+import org.maemo.mica.common.core.ProductUtils;
+
+/**
+ * This dialog tells the user that a build machine should be selected.
+ * @author eswartz
+ *
+ */
+public class SelectVirtualMachineDialog extends MessageDialogWithToggle {
+
+	public static final String BUILD_MACHINE_PREFS_ID = "org.maemo.esbox.maemosdk.ui.preferencePage.buildMachines";
+	public static final String ESBOX_PREFERENCE_CATEGORY_ID = "org.maemo.esbox.ui.preferenceCategory.esbox";
+	
+	private static final String BUG_ME_NOT = "SelectBuildMachineDialog.BugMeNot";
+
+	/**
+	 * 
+	 */
+	public SelectVirtualMachineDialog(Shell shell) {
+		super(shell, "Select Build Machine", null,
+				// note: UI is added below to provide a hyperlink
+				ProductUtils.getProductName() + " needs to know what machine to use to build and launch your code. \n\n"+
+				"Your system cannot directly launch scratchbox or Maemo tools, so a virtual machine running 32-bit Linux/i386 must be used.\n\n"+
+				"Please configure the settings by clicking the link below.",
+				MessageDialog.INFORMATION,
+				new String[] { IDialogConstants.OK_LABEL },
+				0,
+				"Do not remind me again",
+				UIActivator.getDefault().getPreferenceStore().getBoolean(BUG_ME_NOT));
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.IconAndMessageDialog#createMessageArea(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Control createMessageArea(Composite composite) {
+		Composite msgArea = (Composite) super.createMessageArea(composite);
+		
+		// two-column layout...
+		new Label(msgArea, SWT.NONE);
+		
+		Link link = new Link(msgArea, SWT.NONE);
+		link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
+		link.setText("<a href=\"link\">Go to Build Machine preferences...</a>");
+		
+		link.addSelectionListener(new SelectionAdapter() {
+			/* (non-Javadoc)
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				SelectVirtualMachineDialog.this.close();
+				PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(
+						getShell(), 
+						BUILD_MACHINE_PREFS_ID,
+						new String[] { 
+								ESBOX_PREFERENCE_CATEGORY_ID,
+								BUILD_MACHINE_PREFS_ID, 
+							},
+						null);
+				dialog.open();
+			}
+		});
+		return msgArea;
+	}
+	
+}

Added: branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/UIActivator.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/UIActivator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.ui/src/org/maemo/esbox/internal/vm/ui/UIActivator.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -0,0 +1,64 @@
+package org.maemo.esbox.internal.vm.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class UIActivator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.vm.ui";
+
+	// The shared instance
+	private static UIActivator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public UIActivator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static UIActivator getDefault() {
+		return plugin;
+	}
+
+	
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+}

Modified: branches/work_Raul/org.maemo.esbox.vm.vmware/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.vmware/META-INF/MANIFEST.MF	2009-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/META-INF/MANIFEST.MF	2009-08-05 18:08:34 UTC (rev 1943)
@@ -13,10 +13,10 @@
  org.maemo.esbox.vm;bundle-version="2.0.0",
  org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
  org.eclipse.cdt.core;bundle-version="5.0.2",
- org.maemo.mica.maemosdk.flasher;bundle-version="2.0.0",
  org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
  org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.esbox.scratchbox.sb1;bundle-version="2.0.0"
+ org.maemo.esbox.scratchbox.sb1;bundle-version="2.0.0",
+ org.maemo.esbox.vm.ui;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.maemo.esbox.internal.vm.vmware;x-friends:="org.maemo.esbox.vm.tests",

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-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -32,9 +32,9 @@
 import org.maemo.mica.common.core.Policy;
 import org.maemo.mica.common.ui.dialogs.DialogUtils;
 import org.maemo.mica.internal.api.common.core.filesystem.FilesystemUtils;
-import org.maemo.mica.internal.maemosdk.flasher.httpconnection.CopyProgressMonitor;
-import org.maemo.mica.internal.maemosdk.flasher.httpconnection.DownloadingThread;
-import org.maemo.mica.internal.maemosdk.flasher.httpconnection.SessionHandler;
+import org.maemo.mica.internal.api.common.core.httpconnection.CopyProgressMonitor;
+import org.maemo.mica.internal.api.common.core.httpconnection.DownloadingThread;
+import org.maemo.mica.internal.api.common.core.httpconnection.SessionHandler;
 
 import com.nokia.cpp.internal.api.utils.core.Tuple;
 

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-08-05 17:59:47 UTC (rev 1942)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java	2009-08-05 18:08:34 UTC (rev 1943)
@@ -36,7 +36,7 @@
 import org.maemo.esbox.internal.vm.vmware.ui.wizards.MaemoSDKVMInstallData;
 import org.maemo.esbox.vm.core.IVirtualMachine;
 import org.maemo.esbox.vm.core.IVirtualMachineConfiguration;
-import org.maemo.esbox.vm.ui.SelectVirtualMachineDialog;
+import org.maemo.esbox.internal.vm.ui.SelectVirtualMachineDialog;
 import org.maemo.esbox.vm.vmware.IVMwareConfiguration;
 import org.maemo.mica.common.core.Policy;
 import org.maemo.mica.common.core.machine.IBuildMachine;

