[Esbox-commits] r1945 - in branches/work_Raul: org.maemo.esbox.vm/META-INF org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui org.maemo.esbox.vm-feature org.maemo.esbox.vm.vmware/META-INF org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware
fabricioepa at garage.maemo.org
fabricioepa at garage.maemo.org
Wed Aug 5 23:33:04 EEST 2009
Author: fabricioepa
Date: 2009-08-05 23:33:02 +0300 (Wed, 05 Aug 2009)
New Revision: 1945
Added:
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.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:
reverting wrong changes
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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm/META-INF/MANIFEST.MF 2009-08-05 20:33:02 UTC (rev 1945)
@@ -14,11 +14,12 @@
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.esbox.vm.ui;bundle-version="2.0.0"
+ org.maemo.mica.linux.packages.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.preferences,
+ org.maemo.esbox.internal.api.vm.ui,
+ 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.core,
+ org.maemo.esbox.vm.ui
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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -29,7 +29,6 @@
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;
@@ -221,7 +220,7 @@
null,
"Machine Startup Problem",
- UIActivator.getImageDescriptor("icons/full/etool16/virtual_machine_64.png").createImage(),
+ Activator.getImageDescriptor("icons/full/etool16/virtual_machine_64.png").createImage(),
MessageFormat.format("Cannot start or connect to virtual machine ''{0}''",
getName()),
Copied: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java (from rev 1894, 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 (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SlowVirtualMachineLaunchMonitorDialog.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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
Copied: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java (from rev 1894, 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 (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/ui/SynchronizedProgressPartProgressMonitor.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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
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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -19,6 +19,7 @@
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;
@@ -136,6 +137,17 @@
}
}
+ /**
+ * 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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/VirtualBuildMachineConfigurationHandler.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -15,7 +15,7 @@
import org.eclipse.swt.widgets.Display;
import org.maemo.esbox.vm.core.IVirtualMachine;
-import org.maemo.esbox.internal.vm.ui.SelectVirtualMachineDialog;
+import org.maemo.esbox.vm.ui.SelectVirtualMachineDialog;
import org.maemo.mica.common.core.machine.*;
/**
Copied: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java (from rev 1894, 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 (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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.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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml 2009-08-05 20:33:02 UTC (rev 1945)
@@ -58,11 +58,4 @@
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>
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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/META-INF/MANIFEST.MF 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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.vm.ui;bundle-version="2.0.0"
+ org.maemo.esbox.scratchbox.sb1;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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMDownloader.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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.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 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 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 20:16:49 UTC (rev 1944)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/api/vm/vmware/MaemoSDKVMInstaller.java 2009-08-05 20:33:02 UTC (rev 1945)
@@ -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.internal.vm.ui.SelectVirtualMachineDialog;
+import org.maemo.esbox.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;
More information about the Esbox-commits
mailing list