diff options
| author | Roland Grunberg | 2015-11-24 21:31:25 +0000 |
|---|---|---|
| committer | Roland Grunberg | 2015-11-24 21:56:05 +0000 |
| commit | db8dd4400d77b4a5583656f0dd13598d95b87f14 (patch) | |
| tree | d3990b6dd14508cd5500a86e01745e5ca08d7e20 /vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui | |
| parent | c5672e371e0cd8ac58f9372d44eb6f3d26bd8cb7 (diff) | |
| download | org.eclipse.linuxtools-db8dd4400d77b4a5583656f0dd13598d95b87f14.tar.gz org.eclipse.linuxtools-db8dd4400d77b4a5583656f0dd13598d95b87f14.tar.xz org.eclipse.linuxtools-db8dd4400d77b4a5583656f0dd13598d95b87f14.zip | |
Fix hangup caused by EnvironmentsManager's Secure Storage prompt.
Change-Id: I473e914d33b35326a03c27cdbc3a2d8bdf9bf25e
Reviewed-on: https://git.eclipse.org/r/61195
Tested-by: Hudson CI
Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
Diffstat (limited to 'vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui')
| -rw-r--r-- | vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/VagrantToolBarContributionItem.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/VagrantToolBarContributionItem.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/VagrantToolBarContributionItem.java index 8d4df4ef7a..25864d26a7 100644 --- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/VagrantToolBarContributionItem.java +++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/VagrantToolBarContributionItem.java @@ -26,7 +26,6 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.linuxtools.internal.vagrant.core.EnvironmentsManager; import org.eclipse.linuxtools.internal.vagrant.ui.Activator; import org.eclipse.linuxtools.internal.vagrant.ui.SWTImagesFactory; import org.eclipse.linuxtools.vagrant.core.EnumVMStatus; @@ -41,8 +40,10 @@ import org.eclipse.ui.handlers.IHandlerService; public class VagrantToolBarContributionItem extends ContributionItem { public VagrantToolBarContributionItem() { - EnvironmentsManager.getSingleton(); - VagrantService.getInstance().getVMs(); + Thread t = new Thread(() -> { + VagrantService.getInstance().getVMs(); + }); + t.start(); } public VagrantToolBarContributionItem(String id) { @@ -53,7 +54,7 @@ public class VagrantToolBarContributionItem extends ContributionItem { public void fill(Menu menu, int index) { // The menu passed in doesn't allow us to have sub-menus // Ignore it, get the parent IMenuManager and create the structure - if (getParent() instanceof IMenuManager) { + if (getParent() instanceof IMenuManager && VagrantService.getInstance().isVMsLoaded()) { IMenuManager mm = (IMenuManager) getParent(); IContributionItem v = mm.find(getId()); // Menu manager contributions get aggregated so remove them first |