Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2015-11-09 17:15:16 +0000
committerRoland Grunberg2015-11-09 18:30:53 +0000
commit08310e54590880b4a6f27c9ed78465c918f6fa3b (patch)
treea4d04df63c4b1c2569842d763fad647af6dc362a
parent344c1770a22b536490e99819813bcc310fa2f8bc (diff)
downloadorg.eclipse.linuxtools-08310e54590880b4a6f27c9ed78465c918f6fa3b.tar.gz
org.eclipse.linuxtools-08310e54590880b4a6f27c9ed78465c918f6fa3b.tar.xz
org.eclipse.linuxtools-08310e54590880b4a6f27c9ed78465c918f6fa3b.zip
Introduce proper API for retrieving an IVagrantConnection.
- VagrantService will provider an instance of IVagrantConnection - Mark all internal classes appropriately in plugin manifests Change-Id: I544737a72dadab1fb64375bd1652f4ea4a4af965 Reviewed-on: https://git.eclipse.org/r/59976 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com>
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF2
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java10
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/vagrant/core/VagrantService.java31
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF5
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/AddBoxCommandHandler.java3
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/DestroyVMCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshBoxesCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshVMCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RemoveBoxesCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/SSHVMCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StartVMCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StopVMCommandHandler.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantBoxView.java4
-rw-r--r--vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantVMView.java4
15 files changed, 60 insertions, 31 deletions
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF b/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
index 490e67bb12..5a481373d2 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.jface.preference
Bundle-ClassPath: .
-Export-Package: org.eclipse.linuxtools.internal.vagrant.core,
+Export-Package: org.eclipse.linuxtools.internal.vagrant.core;x-internal:=true,
org.eclipse.linuxtools.vagrant.core
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
index 8ef2681764..c4466aaa4d 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
@@ -41,7 +41,6 @@ public class VagrantConnection implements IVagrantConnection, Closeable {
private static final String JSCH_ID = "org.eclipse.jsch.core";
private static final String KEY = "PRIVATEKEY";
private static final String VG = "vagrant"; //$NON-NLS-1$
- private static VagrantConnection client;
private final Object imageLock = new Object();
private final Object containerLock = new Object();
@@ -54,7 +53,7 @@ public class VagrantConnection implements IVagrantConnection, Closeable {
ListenerList vmListeners;
ListenerList boxListeners;
- private VagrantConnection() {
+ public VagrantConnection() {
// Add the box/vm refresh manager to watch the containers list
VagrantBoxRefreshManager vbrm = VagrantBoxRefreshManager.getInstance();
VagrantVMRefreshManager vvrm = VagrantVMRefreshManager.getInstance();
@@ -62,13 +61,6 @@ public class VagrantConnection implements IVagrantConnection, Closeable {
addVMListener(vvrm);
}
- public static IVagrantConnection getInstance() {
- if (client == null) {
- client = new VagrantConnection();
- }
- return client;
- }
-
@Override
public void close() {
}
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/vagrant/core/VagrantService.java b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/vagrant/core/VagrantService.java
new file mode 100644
index 0000000000..e5629528aa
--- /dev/null
+++ b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/vagrant/core/VagrantService.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Red Hat.
+ * 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:
+ * Red Hat - Initial Contribution
+ *******************************************************************************/
+package org.eclipse.linuxtools.vagrant.core;
+
+import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
+
+public class VagrantService {
+
+ private static VagrantConnection client;
+
+ /**
+ * Retrieve an instance of an IVagrantConnection for calling various
+ * 'vagrant' commands.
+ *
+ * @return an instance of an IVagrantConnection
+ */
+ public static IVagrantConnection getInstance() {
+ if (client == null) {
+ client = new VagrantConnection();
+ }
+ return client;
+ }
+}
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF b/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
index 9aec21e261..060d434a09 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/META-INF/MANIFEST.MF
@@ -29,3 +29,8 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
+Export-Package: org.eclipse.linuxtools.internal.vagrant.ui;x-internal:=true,
+ org.eclipse.linuxtools.internal.vagrant.ui.commands;x-internal:=true,
+ org.eclipse.linuxtools.internal.vagrant.ui.propertytesters;x-internal:=true,
+ org.eclipse.linuxtools.internal.vagrant.ui.views;x-internal:=true,
+ org.eclipse.linuxtools.internal.vagrant.ui.wizards;x-internal:=true
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/AddBoxCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/AddBoxCommandHandler.java
index 41d824fb0b..ee9abe328a 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/AddBoxCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/AddBoxCommandHandler.java
@@ -22,6 +22,7 @@ import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.internal.vagrant.ui.wizards.AddBoxWizard;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.VagrantException;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -53,7 +54,7 @@ public class AddBoxCommandHandler extends AbstractHandler {
// pull the image and let the progress
// handler refresh the images when done
try {
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
connection.addBox(boxName, boxLoc);
connection.getBoxes(true);
} catch (final VagrantException e) {
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
index 2e723f9d62..86ba3a2de1 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/CreateVmCommandHandler.java
@@ -27,11 +27,11 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.linuxtools.internal.vagrant.core.Activator;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.internal.vagrant.ui.wizards.CreateVMWizard;
import org.eclipse.linuxtools.vagrant.core.IVagrantBox;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -62,7 +62,7 @@ public class CreateVmCommandHandler extends AbstractHandler {
monitor.beginTask(DVMessages.getFormattedString(CRATE_VM_TITLE, vmName),
IProgressMonitor.UNKNOWN);
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
File vagrantDir;
if (vmFile == null) {
String stateLoc = Activator.getDefault().getStateLocation().toOSString();
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/DestroyVMCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/DestroyVMCommandHandler.java
index c51a41a2fd..26e2cb53a8 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/DestroyVMCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/DestroyVMCommandHandler.java
@@ -16,10 +16,10 @@ import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.linuxtools.internal.vagrant.core.Activator;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
import org.eclipse.linuxtools.vagrant.core.VagrantException;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class DestroyVMCommandHandler extends BaseVMCommandHandler {
@@ -35,7 +35,7 @@ public class DestroyVMCommandHandler extends BaseVMCommandHandler {
@Override
void executeInJob(IVagrantVM vm, IProgressMonitor monitor) {
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
try {
connection.destroyVM(vm.id());
String stateLoc = Activator.getDefault().getStateLocation().toOSString();
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshBoxesCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshBoxesCommandHandler.java
index 1468cdbbea..d6707d2663 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshBoxesCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshBoxesCommandHandler.java
@@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class RefreshBoxesCommandHandler extends AbstractHandler {
@@ -26,7 +26,7 @@ public class RefreshBoxesCommandHandler extends AbstractHandler {
@Override
public Object execute(ExecutionEvent event) {
- final IVagrantConnection connection = VagrantConnection.getInstance();
+ final IVagrantConnection connection = VagrantService.getInstance();
if (connection == null) {
return null;
}
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshVMCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshVMCommandHandler.java
index acdb95e15e..e02ba5b435 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshVMCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RefreshVMCommandHandler.java
@@ -16,9 +16,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class RefreshVMCommandHandler extends AbstractHandler {
@@ -26,7 +26,7 @@ public class RefreshVMCommandHandler extends AbstractHandler {
@Override
public Object execute(ExecutionEvent event) {
- final IVagrantConnection connection = VagrantConnection.getInstance();
+ final IVagrantConnection connection = VagrantService.getInstance();
if (connection == null) {
return null;
}
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RemoveBoxesCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RemoveBoxesCommandHandler.java
index 8a0f8929aa..9ad68dc61a 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RemoveBoxesCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/RemoveBoxesCommandHandler.java
@@ -13,10 +13,10 @@ package org.eclipse.linuxtools.internal.vagrant.ui.commands;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantBox;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.VagrantException;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class RemoveBoxesCommandHandler extends BaseBoxesCommandHandler {
@@ -32,7 +32,7 @@ public class RemoveBoxesCommandHandler extends BaseBoxesCommandHandler {
@Override
void executeInJob(IVagrantBox image, IProgressMonitor monitor) {
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
try {
connection.removeBox(image.getName());
} catch (VagrantException | InterruptedException e) {
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/SSHVMCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/SSHVMCommandHandler.java
index bc932ea12c..6a1eb81fff 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/SSHVMCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/SSHVMCommandHandler.java
@@ -17,8 +17,8 @@ import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
import org.eclipse.tm.terminal.connector.ssh.launcher.SshLauncherDelegate;
public class SSHVMCommandHandler extends BaseVMCommandHandler {
@@ -53,7 +53,7 @@ public class SSHVMCommandHandler extends BaseVMCommandHandler {
currentKeys = DefaultScope.INSTANCE.getNode(JSCH_ID).get(KEY, "");
}
InstanceScope.INSTANCE.getNode(JSCH_ID).put(KEY, currentKeys + "," + identityFile);
- VagrantConnection.getInstance().addToTrackedKeys(identityFile);
+ VagrantService.getInstance().addToTrackedKeys(identityFile);
}
@Override
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StartVMCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StartVMCommandHandler.java
index ce842340d1..c3505ef375 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StartVMCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StartVMCommandHandler.java
@@ -16,10 +16,10 @@ import java.io.InputStreamReader;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class StartVMCommandHandler extends BaseVMCommandHandler {
@@ -38,7 +38,7 @@ public class StartVMCommandHandler extends BaseVMCommandHandler {
@Override
void executeInJob(IVagrantVM vm, IProgressMonitor monitor) {
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
Process p = connection.up(vm.directory(), vm.provider());
String line;
try (BufferedReader buff = new BufferedReader(
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StopVMCommandHandler.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StopVMCommandHandler.java
index 28488df139..f18e6494cd 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StopVMCommandHandler.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/commands/StopVMCommandHandler.java
@@ -13,11 +13,11 @@ package org.eclipse.linuxtools.internal.vagrant.ui.commands;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.views.DVMessages;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
import org.eclipse.linuxtools.vagrant.core.VagrantException;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
public class StopVMCommandHandler extends BaseVMCommandHandler {
@@ -27,7 +27,7 @@ public class StopVMCommandHandler extends BaseVMCommandHandler {
@Override
void executeInJob(final IVagrantVM vm, IProgressMonitor monitor) {
- IVagrantConnection connection = VagrantConnection.getInstance();
+ IVagrantConnection connection = VagrantService.getInstance();
try {
connection.haltVM(vm.id());
} catch (VagrantException | InterruptedException e) {
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantBoxView.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantBoxView.java
index d5c0659ed6..54058ec9ae 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantBoxView.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantBoxView.java
@@ -24,11 +24,11 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantBox;
import org.eclipse.linuxtools.vagrant.core.IVagrantBoxListener;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -150,7 +150,7 @@ public class VagrantBoxView extends ViewPart implements IVagrantBoxListener {
viewer.setComparator(comparator);
// apply search filter
this.viewer.addFilter(getImagesFilter());
- setConnection(VagrantConnection.getInstance());
+ setConnection(VagrantService.getInstance());
connection.addBoxListener(this);
// get the current selection in the tableviewer
getSite().setSelectionProvider(viewer);
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantVMView.java b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantVMView.java
index 8b8e91dc05..67a5ba55ba 100644
--- a/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantVMView.java
+++ b/vagrant/org.eclipse.linuxtools.vagrant.ui/src/org/eclipse/linuxtools/internal/vagrant/ui/views/VagrantVMView.java
@@ -24,12 +24,12 @@ import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.linuxtools.internal.vagrant.core.VagrantConnection;
import org.eclipse.linuxtools.internal.vagrant.ui.SWTImagesFactory;
import org.eclipse.linuxtools.vagrant.core.IVagrantBox;
import org.eclipse.linuxtools.vagrant.core.IVagrantConnection;
import org.eclipse.linuxtools.vagrant.core.IVagrantVM;
import org.eclipse.linuxtools.vagrant.core.IVagrantVMListener;
+import org.eclipse.linuxtools.vagrant.core.VagrantService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
@@ -174,7 +174,7 @@ public class VagrantVMView extends ViewPart implements IVagrantVMListener {
viewer.setComparator(comparator);
// apply search filter
this.viewer.addFilter(getContainersFilter());
- setConnection(VagrantConnection.getInstance());
+ setConnection(VagrantService.getInstance());
connection.addVMListener(this);
// get the current selection in the tableviewer
getSite().setSelectionProvider(viewer);

Back to the top